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

Show commits for merge request immediatly

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-15 01:15:02 +02:00
parent ef396d08fc
commit 8d493019c4
6 changed files with 40 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/merge_requests_controller.rb
View file

@ -40,6 +40,12 @@ class MergeRequestsController < ApplicationController
@notes = @merge_request.notes.inc_author.order("created_at DESC").limit(20)
@note = @project.notes.new(:noteable => @merge_request)
@commits = @project.repo.
commits_between(@merge_request.target_branch, @merge_request.source_branch).
map {|c| Commit.new(c)}.
sort_by(&:created_at).
reverse
render_full_content
respond_to do |format|
@ -48,14 +54,6 @@ class MergeRequestsController < ApplicationController
end
end
def commits
@commits = @project.repo.
commits_between(@merge_request.target_branch, @merge_request.source_branch).
map {|c| Commit.new(c)}.
sort_by(&:created_at).
reverse
end
def diffs
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit