BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit df6bb579 by Robert Speicher
Options

Merge branch 'compare-first-commit' into 'master'

Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814
parents 632f60cc 24cf6865
Showing with 3 additions and 3 deletions
app/controllers/projects/compare_controller.rb
...@@ -20,8 +20,8 @@ class Projects::CompareController < Projects::ApplicationController ...@@ -20,8 +20,8 @@ class Projects::CompareController < Projects::ApplicationController
if compare_result if compare_result
@commits = Commit.decorate(compare_result.commits, @project) @commits = Commit.decorate(compare_result.commits, @project)
@diffs = compare_result.diffs @diffs = compare_result.diffs
@commit = @commits.last @commit = @project.commit(head_ref)
@first_commit = @commits.first @first_commit = @project.commit(base_ref)
@line_notes = [] @line_notes = []
end end
end end
......
app/helpers/diff_helper.rb
...@@ -161,7 +161,7 @@ module DiffHelper ...@@ -161,7 +161,7 @@ module DiffHelper
def commit_for_diff(diff) def commit_for_diff(diff)
if diff.deleted_file if diff.deleted_file
first_commit = @first_commit || @commit first_commit = @first_commit || @commit
first_commit.parent first_commit.parent || @first_commit
else else
@commit @commit
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment