diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
| commit | 1af3f3b673be8f85b37d455b101954e62c2a3add (patch) | |
| tree | 56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /app/workers | |
| parent | 67c8526033241f6bd190fa16622970b3919e6dbd (diff) | |
| parent | bd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff) | |
| download | gitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz | |
Merge branch 'master' into jej-pages-picked-from-ee
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index b9cd49985dc..f5ccc84c160 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -33,13 +33,15 @@ class EmailsOnPushWorker reverse_compare = false if action == :push - compare = CompareService.new.execute(project, after_sha, project, before_sha) + compare = CompareService.new(project, after_sha) + .execute(project, before_sha) diff_refs = compare.diff_refs return false if compare.same if compare.commits.empty? - compare = CompareService.new.execute(project, before_sha, project, after_sha) + compare = CompareService.new(project, before_sha) + .execute(project, after_sha) diff_refs = compare.diff_refs reverse_compare = true |