diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-20 15:47:32 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-04-25 16:54:10 +0100 |
| commit | a0979c05fd5976cabe3c0633c168848d66320bfa (patch) | |
| tree | ec0aa3a394e875871cdec10ce61a3e75ba7f3eb9 /app/models/merge_request_diff.rb | |
| parent | d1e570221bfdf1f513af017e39d7ebfe8967cfe3 (diff) | |
| download | gitlab-ce-a0979c05fd5976cabe3c0633c168848d66320bfa.tar.gz | |
Show correct size when MR diff overflows
The problem is that we often go via a diff object constructed from the diffs
stored in the DB. Those diffs, by definition, don't overflow, so we don't have
access to the 'correct' `real_size` - that is stored on the MR diff object
iself.
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 6604af2b47e..f0a3c30ea74 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -260,7 +260,7 @@ class MergeRequestDiff < ActiveRecord::Base new_attributes[:state] = :empty else diff_collection = compare.diffs(Commit.max_diff_options) - new_attributes[:real_size] = compare.diffs.real_size + new_attributes[:real_size] = diff_collection.real_size if diff_collection.any? new_diffs = dump_diffs(diff_collection) |