Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #90] fix diff

This commit is contained in:
Alexander Machehin 2012-05-10 18:32:54 +06:00
parent d4a5b78b21
commit 4040a486fe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/projects/pull_requests_controller.rb
View File

@ -16,10 +16,12 @@ class Projects::PullRequestsController < Projects::BaseController
@pull.base_ref = @pull.base_project.default_branch @pull.base_ref = @pull.base_project.default_branch
@pull.head_ref = params[:treeish].presence || @pull.head_project.default_branch @pull.head_ref = params[:treeish].presence || @pull.head_project.default_branch
@base_commit = @pull.base_project.git_repository.commits(@base_ref).first
@head_commit = @pull.head_project.git_repository.commits(@head_ref).first
@pull.check @pull.check
#@pull.save
repo = Git::Repository.new(@pull.path)
@base_commit = repo.commits(@pull.base_ref).first
@head_commit = repo.commits(@pull.head_ref).first
@diff = Grit::Repo.new(@pull.path).diff @base_commit, @head_commit @diff = Grit::Repo.new(@pull.path).diff @base_commit, @head_commit
end end

1
app/views/projects/pull_requests/new.html.haml
View File

@ -32,7 +32,6 @@
.rightlist=f.submit t('.submit'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_pull' .rightlist=f.submit t('.submit'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_pull'
.both .both
#diff.tab-pane #diff.tab-pane
=@head_commit
-begin -begin
=# render_commit_stats(stats) =# render_commit_stats(stats)