gitlab_git 10.1.1 → 10.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496965fbe870ebb721b318e505e59cc98d498a85
-  data.tar.gz: dd57cd988aa8e107671960fab9e95b9670b2b056
+  metadata.gz: d11e929a847b0ead24d039c132c3fa3c05815c61
+  data.tar.gz: 8e965143c170a140628ca39097c50d616bdd268b
 SHA512:
-  metadata.gz: b5aa54533ab2ffc0ba142c7826df82a253e6e480c6b83f14395196c98dea093326524812df00c95a4803038e3a01fd67d8a2e724e447e9068a72451d0cda6d07
-  data.tar.gz: 6d70a21c64578a219483de6315e69d52d94b94b031159f77a2e6b7a78f206e9f09d1c7279df7bb318f7d9b508b63e3941d7c141ea253af5105f289f7f88e6557
+  metadata.gz: 5785a2fefa0fab91f006078947d0bf8ebf660450cc001296a46b8fb42203f5379a1e88ddcb01d9a1e7c1ab71e56591e4994c41def24764de6b959058753104ca
+  data.tar.gz: 3976529a53e2a7ffc68c21ce8c7fe2fb38de5bbe70ca72f80b386b9d5390c2c9e2ff41d736bc17dd5205b307689245adf8a31949815a92799eccbf08a537b9a5

data/VERSION

@@ -1 +1 @@
-10.1.1
+10.1.2

data/lib/gitlab_git/blob.rb

@@ -212,6 +212,8 @@ module Gitlab
         %w(id name path size data mode commit_id).each do |key|
           self.send("#{key}=", options[key.to_sym])
         end
+
+        @loaded_all_data = false
       end
 
       def empty?
@@ -226,7 +228,9 @@ module Gitlab
       # memory as a Ruby string.
       def load_all_data!(repository)
         return if @data == '' # don't mess with submodule blobs
+        return @data if @loaded_all_data
 
+        @loaded_all_data = true
         @data = repository.lookup(id).content
       end
 

data/lib/gitlab_git/diff_collection.rb

@@ -9,9 +9,11 @@ module Gitlab
         @iterator = iterator
         @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
         @all_diffs = !!options.fetch(:all_diffs, false)
 
         @line_count = 0
+        @byte_count = 0
         @overflow = false
         @array = Array.new
       end
@@ -46,8 +48,9 @@ module Gitlab
           end
 
           @line_count += diff.line_count
+          @byte_count += diff.diff.bytesize
 
-          if !@all_diffs && @line_count >= @max_lines
+          if !@all_diffs && (@line_count >= @max_lines || @byte_count >= @max_bytes)
             # This last Diff instance pushes us over the lines limit. We stop and
             # discard it.
             @overflow = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.1.1
+  version: 10.1.2
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library