diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2017-05-09 12:27:17 +0200 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-05-09 12:27:17 +0200 |
commit | 48254d187f421dfeb85a84bf2b86399add6e6a67 (patch) | |
tree | 1c816bf6defc73c0a50f0a287367e9518a0b0a02 /app | |
parent | 62b0eb2c0ba02d2a9c9515722dfcb7ec61b7fc6a (diff) | |
download | gitlab-ce-48254d187f421dfeb85a84bf2b86399add6e6a67.tar.gz |
Don't use DiffCollection for deltas
Diffstat (limited to 'app')
-rw-r--r-- | app/models/commit.rb | 6 | ||||
-rw-r--r-- | app/services/git_push_service.rb | 2 | ||||
-rw-r--r-- | app/workers/irker_worker.rb | 6 |
3 files changed, 9 insertions, 5 deletions
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 |