diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-23 15:51:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-23 15:51:55 +0000 |
| commit | 401b51f76714e834ccec3b6d9f756a3e63e86724 (patch) | |
| tree | 386b6cc258835d470bc0b6b5b0380cd99e9ee5bd /app/models | |
| parent | fae2650cbc23c95242124a0a6d9e9c79948cac6d (diff) | |
| parent | 5a2c68811712aecdece01ed203cda2ae2bb32ca9 (diff) | |
| download | gitlab-ce-401b51f76714e834ccec3b6d9f756a3e63e86724.tar.gz | |
Merge branch 'fix-mr-size-with-over-100-files' into 'master'
Fix MR changes tab size count
Closes #27563
See merge request !9091
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 204d2b153ad..9076179b0b3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -203,7 +203,11 @@ class MergeRequest < ActiveRecord::Base end def diff_size - opts = diff_options || {} + # The `#diffs` method ends up at an instance of a class inheriting from + # `Gitlab::Diff::FileCollection::Base`, so use those options as defaults + # here too, to get the same diff size without performing highlighting. + # + opts = Gitlab::Diff::FileCollection::Base.default_options.merge(diff_options || {}) raw_diffs(opts).size end |