Explain why we have an 'overflow' statelazy-diffs

1 files changed, 7 insertions, 2 deletions

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 4bafc8df97e..df08d3a6dfb 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -143,9 +143,14 @@ class MergeRequestDiff < ActiveRecord::Base
     else
       diff_collection = unmerged_diffs
 
-      self.state = :overflow if diff_collection.overflow?
+      if diff_collection.overflow?
+        # Set our state to 'overflow' to make the #empty? and #collected?
+        # methods (generated by StateMachine) return false.
+        self.state = :overflow
+      end
+
       self.real_size = diff_collection.real_size
-      
+
       if diff_collection.any?
         new_diffs = dump_diffs(diff_collection)
         self.state = :collected