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/helpers/diff_helper.rb | |
| parent | 26f7d023e6d15f4deab39f74509bd6dddebf6974 (diff) | |
| download | gitlab-ce-577f2fb47a7ef57415b78b49d5c746d4e99f6a98.tar.gz | |
Save and use actual diff base commit for MR diff highlighting
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index f500d3572e0..62971d1e14b 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -102,8 +102,7 @@ module DiffHelper def commit_for_diff(diff) if diff.deleted_file - first_commit = @first_commit || @commit - first_commit.parent || @first_commit + @base_commit || @commit.parent || @commit else @commit end |