gitlab_git 10.3.1 → 10.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55854e0a55dc3bbcfb18be3835834cf99c3f2c26
-  data.tar.gz: 4d174b9be6315b47a1b45ed61e893863c7b3a68e
+  metadata.gz: 51076bd426c1093deb3ac7921090402ff3217397
+  data.tar.gz: 0bcd48cc52ef0ec8ecd4bcc7d45c892ec31b21d0
 SHA512:
-  metadata.gz: 560d061fe203d069ee5cff609aa9645ff89bf760e25fe3d3740a6aa8d7bd3e9258bf78382b360cdaa9012cd8e08b0be18874f07c57d86c2a4984441dd52b0d59
-  data.tar.gz: 9a1231145e9cccf76b992a11cdf961e5c161783cb8a6038be15c43dd3a00d562783f7d452c95b74caa01c8ff7de9120e08ad36ffcc5d4aafc97ef3e7f885d95d
+  metadata.gz: f84755a8d8474f773236438cb92d5264ce75ee935609faf2b6d9efe0210285c632bf157d4b599f46893075c6fe68ebe52c93ccc3b9053e3904a5f774057d8051
+  data.tar.gz: 6470f132620cff756f6c6810b4ef042ea2cab28eec465806fc38d5ab6f8199c6a8ac0832753fa652c1fb9e302eb02cca7c004a40b48729e10ea13325bcc3f7f6

data/VERSION

@@ -1 +1 @@
-10.3.1
+10.3.2

data/lib/gitlab_git/diff.rb

@@ -133,7 +133,7 @@ module Gitlab
                              :include_untracked_content, :skip_binary_check,
                              :include_typechange, :include_typechange_trees,
                              :ignore_filemode, :recurse_ignored_dirs, :paths,
-                             :max_files, :max_lines, :all_diffs]
+                             :max_files, :max_lines, :all_diffs, :no_collapse]
 
           if default_options
             actual_defaults = default_options.dup
@@ -208,6 +208,21 @@ module Gitlab
         @too_large = true
       end
 
+      def collapsed?
+        return @collapsed if defined?(@collapsed)
+        false
+      end
+
+      def collapsible?
+        @diff.bytesize >= 10240 # 10 KB
+      end
+
+      def prune_collapsed_diff!
+        @diff = ''
+        @line_count = 0
+        @collapsed = true
+      end
+
       private
 
       def init_from_rugged(rugged)

data/lib/gitlab_git/diff_collection.rb

@@ -10,7 +10,11 @@ module Gitlab
         @max_files = options.fetch(:max_files, DEFAULT_LIMITS[:max_files])
         @max_lines = options.fetch(:max_lines, DEFAULT_LIMITS[:max_lines])
         @max_bytes = @max_files * 5120 # Average 5 KB per file
+        @safe_max_files = [@max_files, DEFAULT_LIMITS[:max_files]].min
+        @safe_max_lines = [@max_lines, DEFAULT_LIMITS[:max_lines]].min
+        @safe_max_bytes = @safe_max_files * 5120 # Average 5 KB per file
         @all_diffs = !!options.fetch(:all_diffs, false)
+        @no_collapse = !!options.fetch(:no_collapse, true)
 
         @line_count = 0
         @byte_count = 0
@@ -47,6 +51,12 @@ module Gitlab
             diff.prune_large_diff!
           end
 
+          if !@all_diffs && !@no_collapse
+            if diff.collapsible? || over_safe_limits?(i)
+              diff.prune_collapsed_diff!
+            end
+          end
+
           @line_count += diff.line_count
           @byte_count += diff.diff.bytesize
 
@@ -99,6 +109,10 @@ module Gitlab
         @populated = true
         nil
       end
+
+      def over_safe_limits?(files)
+        files >= @safe_max_files || @line_count > @safe_max_lines || @byte_count >= @safe_max_bytes
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.3.1
+  version: 10.3.2
 platform: ruby
 authors:
 - Dmitriy Zaporozhets