gitlab_git 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f50f9e00d569ecfecbe4adfe97e1fc0d2447c22
-  data.tar.gz: 27e4b6264bc6ce74b6739aac75e4e19acc040786
+  metadata.gz: 6153bb71b711454165303016cafd44943691bcf6
+  data.tar.gz: 05faffaaa0c4346fbfda09b80d24692044c7a3c4
 SHA512:
-  metadata.gz: 16c170c207b76cfd0dcc369846843c12e9ce4887857002fa5ef828156c9f3266fcc12de2c56f5537641879569f0d1bbc5bbf8de11de4c9e9b8076aee0126c8c5
-  data.tar.gz: faea583a376c4a040777edcecd0934f2b7384688bc93fc41d078d9463401f28361bbf143a11cbc8dee9498f9cc430b4ac3868d7b2761970691c5b41738ed08b1
+  metadata.gz: ae2038afe8f25b18e141969b0099ea3d64fcca4475bfd287f1bc5fd7089c5ee3092d7e36e2191d633b89546c2d6ac941090d7f8ee3198fe1b23e2e7d1af93066
+  data.tar.gz: 190841dbc36231e05a999fb3c6f4a848d4e6d5d8d51b85925e3ca325dd4902851ac5493cd70bf0385be90014bb03e4ca59681db6075385eda12854b6fd39ff7d

data/lib/gitlab_git/git_stats.rb

@@ -10,9 +10,14 @@ module Gitlab
       end
 
       def log
-        # Limit log to 8k commits to avoid timeout for huge projects
-        args = ['-8000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges']
-        repo.git.run(nil, 'log', nil, {}, args)
+        log = nil
+        Grit::Git.with_timeout(15) do
+          # Limit log to 8k commits to avoid timeout for huge projects
+          args = ['-8000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges']
+          log = repo.git.run(nil, 'log', nil, {}, args)
+        end
+
+        log
       rescue Grit::Git::GitTimeout
         nil
       end

data/lib/gitlab_git/log_parser.rb

@@ -14,9 +14,11 @@ module Gitlab
           entry[:author_email] = slice[1]
           entry[:date] = slice[2]
 
-          changes = slice[4].split(",")
-          entry[:additions] = changes[1].to_i unless changes[1].nil?
-          entry[:deletions] = changes[2].to_i unless changes[2].nil?
+          if slice[4]
+            changes = slice[4].split(",")
+            entry[:additions] = changes[1].to_i unless changes[1].nil?
+            entry[:deletions] = changes[2].to_i unless changes[2].nil?
+          end
 
           collection.push(entry)
         end

metadata

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