diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-17 15:56:10 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-17 15:56:10 +0000 |
commit | e324ccc20c52d492dd660097a4c72615c5621917 (patch) | |
tree | d3449ff9db8372a2e507e22c1924cd693e75c23f /app/models/merge_request_diff.rb | |
parent | cfdae8f103568d843afb3c714444c912510a5f1f (diff) | |
parent | ca0cf5a3cd2829db4cfac007c36d5588ed369f87 (diff) | |
download | gitlab-ce-e324ccc20c52d492dd660097a4c72615c5621917.tar.gz |
Merge branch 'issue_25017' into 'master'
Show 'too many changes' message for merge request
Closes #25017
See merge request !8444
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 64dd586c9e0..dadb81f9b6e 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 |