Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-12-07 17:24:37 +0300
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-12-07 17:24:37 +0300
commit7385e7cd47f1eaab355d2fd8ca91b9d056b4576d (patch)
tree25f35ba7b6ff972cca7ebe66a932d7ac3fe40890 /app/workers
parent61d91f640b94d6e273dee502b77e723b599ab86c (diff)
Backports changes made to One notification per code review
The EE merge request can be found here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8442
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/new_note_worker.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/workers/new_note_worker.rb b/app/workers/new_note_worker.rb
index 42f5b945a75..98f9f45e608 100644
--- a/app/workers/new_note_worker.rb
+++ b/app/workers/new_note_worker.rb
@@ -8,11 +8,18 @@ class NewNoteWorker
# rubocop: disable CodeReuse/ActiveRecord
def perform(note_id, _params = {})
if note = Note.find_by(id: note_id)
- NotificationService.new.new_note(note)
+ NotificationService.new.new_note(note) unless skip_notification?(note)
Notes::PostProcessService.new(note).execute
else
Rails.logger.error("NewNoteWorker: couldn't find note with ID=#{note_id}, skipping job")
end
end
+
+ private
+
+ # EE-only method
+ def skip_notification?(note)
+ false
+ end
# rubocop: enable CodeReuse/ActiveRecord
end