diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-20 18:44:27 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-20 18:44:27 +0100 |
| commit | 577f2fb47a7ef57415b78b49d5c746d4e99f6a98 (patch) | |
| tree | ef621d0febcae9079253b93ae5c319ae94e8d4de /app/controllers | |
| parent | 26f7d023e6d15f4deab39f74509bd6dddebf6974 (diff) | |
| download | gitlab-ce-577f2fb47a7ef57415b78b49d5c746d4e99f6a98.tar.gz | |
Save and use actual diff base commit for MR diff highlighting
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 60360c8e5c8..f8ec76cd4e5 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -21,8 +21,8 @@ class Projects::CompareController < Projects::ApplicationController @commits = Commit.decorate(compare_result.commits, @project) @diffs = compare_result.diffs @commit = @project.commit(head_ref) - @first_commit = @project.commit(base_ref) - @diff_refs = [@first_commit, @commit] + @base_commit = @project.commit(base_ref) + @diff_refs = [@base_commit, @commit] @line_notes = [] end end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index a6284a24223..ed3050d59aa 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -58,7 +58,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController def diffs @commit = @merge_request.last_commit - @first_commit = @merge_request.first_commit + @base_commit = @merge_request.diff_base_commit + + # MRs created before 8.4 don't have a diff_base_commit, + # but we need it for the "View file @ ..." link by deleted files + @base_commit ||= @merge_request.first_commit.parent || @merge_request.first_commit @comments_allowed = @reply_allowed = true @comments_target = { @@ -102,7 +106,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @source_project = merge_request.source_project @commits = @merge_request.compare_commits.reverse @commit = @merge_request.last_commit - @first_commit = @merge_request.first_commit + @base_commit = @merge_request.diff_base_commit @diffs = @merge_request.compare_diffs @ci_commit = @merge_request.ci_commit |