diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-27 20:00:34 +0300 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-03 08:00:20 +0300 |
| commit | c86c1905b5574cac234315598d8d715fcaee3ea7 (patch) | |
| tree | 31ba7ab51c04b07ea70d15db88f2370f9ca6359e /app/workers/emails_on_push_worker.rb | |
| parent | 1d0c7b74920a94e488e6a2c090abb3e525438053 (diff) | |
switch from diff_file_collection to diffs
So we have raw_diffs too
Diffstat (limited to 'app/workers/emails_on_push_worker.rb')
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 0b63913cfd1..c6a5af2809a 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -33,18 +33,13 @@ class EmailsOnPushWorker reverse_compare = false if action == :push - base_commit = project.merge_base_commit(before_sha, after_sha) - compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha) - compare = Compare.decorate(compare, project) - compare.base_commit = base_commit + compare = CompareService.new.execute(project, before_sha, project, after_sha) diff_refs = compare.diff_refs return false if compare.same if compare.commits.empty? - compare = Gitlab::Git::Compare.new(project.repository.raw_repository, after_sha, before_sha) - compare = Compare.decorate(compare, project) - compare.base_commit = base_commit + compare = CompareService.new.execute(project, after_sha, project, before_sha) diff_refs = compare.diff_refs reverse_compare = true |