diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 13:10:01 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 13:10:01 +0100 |
| commit | 24cf6865d3c0d47615a814c091cdb40bf513307e (patch) | |
| tree | c41c76fd548ba15fed550a3cb86e207963f6feea | |
| parent | 264dc3f7dd15f2abb6ec90fe72ed88f4cdda6f58 (diff) | |
| download | gitlab-ce-compare-first-commit.tar.gz | |
Correctly set comparison first commit when range includes a merge commitcompare-first-commit
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 4 | ||||
| -rw-r--r-- | app/helpers/diff_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index 71aaad1fad6..3517b2bece6 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -19,8 +19,8 @@ class Projects::CompareController < Projects::ApplicationController if compare_result @commits = Commit.decorate(compare_result.commits, @project) @diffs = compare_result.diffs - @commit = @commits.last - @first_commit = @commits.first + @commit = @project.commit(head_ref) + @first_commit = @project.commit(base_ref) @line_notes = [] end end diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index b889fb28973..f7bf2a66eb5 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -171,7 +171,7 @@ module DiffHelper def commit_for_diff(diff) if diff.deleted_file first_commit = @first_commit || @commit - first_commit.parent + first_commit.parent || @first_commit else @commit end |