diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-04 13:11:33 -0400 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-06 18:51:02 -0400 |
| commit | d9c75aec3adf23428e4c85a21ce2c357da006b6c (patch) | |
| tree | 357bb2853ee5157f2d41d8c0de8668bc1600577b | |
| parent | 0a5e387284d2090172b17e6732cbf6b424768cbd (diff) | |
| download | gitlab-ce-d9c75aec3adf23428e4c85a21ce2c357da006b6c.tar.gz | |
Use stored start and head for MR diff without whitespace
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index b81ab817dfe..7ad97a75d53 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -40,8 +40,8 @@ class MergeRequestDiff < ActiveRecord::Base @diffs_no_whitespace ||= begin compare = Gitlab::Git::Compare.new( self.repository.raw_repository, - self.target_branch_sha, - self.source_branch_sha, + self.start_commit_sha || self.target_branch_sha, + self.head_commit_sha || self.source_branch_sha, ) compare.diffs(options) end |