diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-03 14:41:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-03 14:41:58 +0000 |
| commit | 2a73be51619d0ab1feab1e7b9f52541e9b1432f5 (patch) | |
| tree | 8932f643d81b345290d0b2cda4721fe1261ece42 /app | |
| parent | c39daf937bd62eedcbe7e3b44f107bb7e87452e7 (diff) | |
| parent | f2d50af917b878a98e06b994ac32c0718f3d0b78 (diff) | |
| download | gitlab-ce-2a73be51619d0ab1feab1e7b9f52541e9b1432f5.tar.gz | |
Merge branch 'merge-request-commits-background-migration' into 'master'
Merge request commits background migration
See merge request !12685
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index ec87aee9310..d9d746ccf41 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -85,11 +85,7 @@ class MergeRequestDiff < ActiveRecord::Base def raw_diffs(options = {}) if options[:ignore_whitespace_change] - @diffs_no_whitespace ||= - Gitlab::Git::Compare.new( - repository.raw_repository, - safe_start_commit_sha, - head_commit_sha).diffs(options) + @diffs_no_whitespace ||= compare.diffs(options) else @raw_diffs ||= {} @raw_diffs[options] ||= load_diffs(options) |