diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-14 04:29:53 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-14 04:53:11 +0300 |
| commit | 87cb74a7bc98e19c2b2fab5643dfcb591255d077 (patch) | |
| tree | 3b310b6e5a1dba155f4fd5c6b64d60b8db7dcb66 /app/controllers/projects/merge_requests/creations_controller.rb | |
| parent | 64701b51aeacf4f4f932f205a2d831880b757a43 (diff) | |
Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set
Diffstat (limited to 'app/controllers/projects/merge_requests/creations_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |