Merge branch 'deltas-only' into 'master'

Don't use DiffCollection for deltas

See merge request !11201

3 files changed, 7 insertions, 5 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 9359b323ed4..dea18bfedef 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -336,6 +336,8 @@ class Commit
     end
   end
 
+  delegate :deltas, to: :raw, prefix: :raw
+
   def diffs(diff_options = nil)
     Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
   end
@@ -373,7 +375,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
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index b8bd7720265..d22236b961b 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