diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-15 13:19:49 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 15:37:05 -0500 |
| commit | 7c479d88a92233790bc0fb63146fe004f8b9b5d7 (patch) | |
| tree | 3691c9e55229b145ea631bca724ba4da8c467d70 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 7e09a9b7dcef125af2e775869754a3327935b12d (diff) | |
| download | gitlab-ce-7c479d88a92233790bc0fb63146fe004f8b9b5d7.tar.gz | |
Pass fallback_diff_refs to Diff::File instead of using view helpers
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0352065998b..c8f68192f24 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -502,7 +502,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController def define_commit_vars @commit = @merge_request.diff_head_commit - @base_commit = @merge_request.diff_base_commit || @merge_request.likely_diff_base_commit end def define_diff_vars @@ -569,7 +568,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController @source_project = merge_request.source_project @commits = @merge_request.compare_commits.reverse @commit = @merge_request.diff_head_commit - @base_commit = @merge_request.diff_base_commit @note_counts = Note.where(commit_id: @commits.map(&:id)). group(:commit_id).count |