Merge branch 'master' of github.com:gitlabhq/gitlabhq

1 files changed, 12 insertions, 2 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 082086d8e5a..339e485e6d2 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -137,8 +137,18 @@ class Repository
 
   def graph_log
     Rails.cache.fetch(cache_key(:graph_log)) do
-      stats = Gitlab::Git::GitStats.new(raw_repository, root_ref, Gitlab.config.git.timeout)
-      stats.parsed_log
+      commits = raw_repository.log(limit: 6000, skip_merges: true,
+                                   ref: root_ref)
+      commits.map do |rugged_commit|
+        commit = Gitlab::Git::Commit.new(rugged_commit)
+
+        {
+          author_name: commit.author_name.force_encoding('UTF-8'),
+          author_email: commit.author_email.force_encoding('UTF-8'),
+          additions: commit.stats.additions,
+          deletions: commit.stats.deletions
+        }
+      end
     end
   end