diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 09:55:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 09:55:53 +0000 |
| commit | d2340d88c6f218a1d0f33e4e9c660f8de6a79cf2 (patch) | |
| tree | 86aa153844ff54ca48c114de4a67f7234f43c160 | |
| parent | 0f590750307bdd871b20a8d87fc6963d95f2e00c (diff) | |
| parent | 99432cbcfbcec1f4f260a503d2d9d0142bc34f5a (diff) | |
| download | gitlab-ce-d2340d88c6f218a1d0f33e4e9c660f8de6a79cf2.tar.gz | |
Merge branch 'preserve-second-parameter-new-note-worker' into 'master'
Preserve optional second parameter in NewNoteWorker jobs
Closes #24678
See merge request !7602
| -rw-r--r-- | app/workers/new_note_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/new_note_worker.rb b/app/workers/new_note_worker.rb index 66574d0fd01..926162b8c53 100644 --- a/app/workers/new_note_worker.rb +++ b/app/workers/new_note_worker.rb @@ -2,7 +2,9 @@ class NewNoteWorker include Sidekiq::Worker include DedicatedSidekiqQueue - def perform(note_id) + # Keep extra parameter to preserve backwards compatibility with + # old `NewNoteWorker` jobs (can remove later) + def perform(note_id, _params = {}) if note = Note.find_by(id: note_id) NotificationService.new.new_note(note) Notes::PostProcessService.new(note).execute |