diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-12-30 17:16:25 -0200 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-01-12 13:41:29 -0200 |
commit | ca0cf5a3cd2829db4cfac007c36d5588ed369f87 (patch) | |
tree | bc5783a137de10e25358a24d764b50daabdf68ef /app/models/merge_request_diff.rb | |
parent | ec4fe4432a2c4daa14c8e8f7c5d8567553062ebf (diff) | |
download | gitlab-ce-ca0cf5a3cd2829db4cfac007c36d5588ed369f87.tar.gz |
Show 'too many changes' message for merge requestissue_25017
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r-- | app/models/merge_request_diff.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index b8f36a2c958..f0e2fadc32b 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -234,28 +234,28 @@ class MergeRequestDiff < ActiveRecord::Base # and save it as array of hashes in st_diffs db field def save_diffs new_attributes = {} - new_diffs = [] if commits.size.zero? new_attributes[:state] = :empty else diff_collection = compare.diffs(Commit.max_diff_options) - - if diff_collection.overflow? - # Set our state to 'overflow' to make the #empty? and #collected? - # methods (generated by StateMachine) return false. - new_attributes[:state] = :overflow - end - - new_attributes[:real_size] = diff_collection.real_size + new_attributes[:real_size] = compare.diffs.real_size if diff_collection.any? new_diffs = dump_diffs(diff_collection) new_attributes[:state] = :collected end + + new_attributes[:st_diffs] = new_diffs || [] + + # Set our state to 'overflow' to make the #empty? and #collected? + # methods (generated by StateMachine) return false. + # + # This attribution has to come at the end of the method so 'overflow' + # state does not get overridden by 'collected'. + new_attributes[:state] = :overflow if diff_collection.overflow? end - new_attributes[:st_diffs] = new_diffs update_columns_serialized(new_attributes) end |