deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed merge request diff

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-11-29 20:06:37 +02:00
parent 958497fecb
commit 79b64ef4ac
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/merge_requests_controller.rb
View file

@ -34,8 +34,9 @@ class MergeRequestsController < ApplicationController
end
def diffs
@commit = @project.commit(@merge_request.source_branch)
@diffs = @project.repo.diff(@merge_request.target_branch, @merge_request.source_branch)
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit
render :template => "merge_requests/_diffs", :layout => false
end