From 87cb74a7bc98e19c2b2fab5643dfcb591255d077 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 13 Jul 2017 18:29:53 -0700 Subject: Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set --- app/controllers/projects/merge_requests/creations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index da058da795e..f35d53896ba 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -107,7 +107,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap @target_project = @merge_request.target_project @source_project = @merge_request.source_project - @commits = @merge_request.compare_commits.reverse + @commits = @merge_request.commits @commit = @merge_request.diff_head_commit @note_counts = Note.where(commit_id: @commits.map(&:id)) -- cgit v1.2.3