From 48254d187f421dfeb85a84bf2b86399add6e6a67 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 9 May 2017 12:27:17 +0200
Subject: Don't use DiffCollection for deltas

---
 app/models/commit.rb             | 6 +++++-
 app/services/git_push_service.rb | 2 +-
 app/workers/irker_worker.rb      | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 9359b323ed4..e1da8e75c0c 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -373,7 +373,7 @@ class Commit
   def repo_changes
     changes = { added: [], modified: [], removed: [] }
 
-    raw_diffs(deltas_only: true).each do |diff|
+    raw_deltas.each do |diff|
       if diff.deleted_file
         changes[:removed] << diff.old_path
       elsif diff.renamed_file || diff.new_file
@@ -386,6 +386,10 @@ class Commit
     changes
   end
 
+  def raw_deltas
+    raw.deltas
+  end
+
   def merged_merge_request?(user)
     !!merged_merge_request(user)
   end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 45411c779cc..5e503cdfc32 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -67,7 +67,7 @@ class GitPushService < BaseService
       paths = Set.new
 
       @push_commits.each do |commit|
-        commit.raw_diffs(deltas_only: true).each do |diff|
+        commit.raw_deltas.each do |diff|
           paths << diff.new_path
         end
       end
diff --git a/app/workers/irker_worker.rb b/app/workers/irker_worker.rb
index c9658b3fe17..22f67fa9e9f 100644
--- a/app/workers/irker_worker.rb
+++ b/app/workers/irker_worker.rb
@@ -142,10 +142,10 @@ class IrkerWorker
   end
 
   def files_count(commit)
-    diffs = commit.raw_diffs(deltas_only: true)
+    diff_size = commit.raw_deltas.size
 
-    files = "#{diffs.real_size} file"
-    files += 's' if diffs.size > 1
+    files = "#{diff_size} file"
+    files += 's' if diff_size > 1
     files
   end
 
-- 
cgit v1.2.3


From f1a14d685702bc8ea29791cda8440c3bab3c14a1 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 9 May 2017 13:48:21 +0200
Subject: Don't make Commit#raw_deltas private

---
 app/models/commit.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/models/commit.rb b/app/models/commit.rb
index e1da8e75c0c..e31ca64cee9 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -336,6 +336,10 @@ class Commit
     end
   end
 
+  def raw_deltas
+    raw.deltas
+  end
+
   def diffs(diff_options = nil)
     Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
   end
@@ -386,10 +390,6 @@ class Commit
     changes
   end
 
-  def raw_deltas
-    raw.deltas
-  end
-
   def merged_merge_request?(user)
     !!merged_merge_request(user)
   end
-- 
cgit v1.2.3


From 3107f2e460d8db35f7ddd0cc5f68575233bfc133 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 9 May 2017 14:44:15 +0200
Subject: Use Rails 'delegate'

---
 app/models/commit.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/models/commit.rb b/app/models/commit.rb
index e31ca64cee9..dea18bfedef 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -336,9 +336,7 @@ class Commit
     end
   end
 
-  def raw_deltas
-    raw.deltas
-  end
+  delegate :deltas, to: :raw, prefix: :raw
 
   def diffs(diff_options = nil)
     Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
-- 
cgit v1.2.3