diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-15 21:19:49 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 23:37:05 +0300 |
| commit | 7c479d88a92233790bc0fb63146fe004f8b9b5d7 (patch) | |
| tree | 3691c9e55229b145ea631bca724ba4da8c467d70 /app/controllers | |
| parent | 7e09a9b7dcef125af2e775869754a3327935b12d (diff) | |
Pass fallback_diff_refs to Diff::File instead of using view helpers
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 008d2f5815f..7ec542bb2df 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -53,7 +53,6 @@ class Projects::CompareController < Projects::ApplicationController @commits = @compare.commits @start_commit = @compare.start_commit @commit = @compare.commit - @base_commit = @compare.base_commit @diffs = @compare.diffs(diff_options) 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 |