diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-09 19:29:11 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 08bbb9fce66cb46d3262e6cd4c4379b59f065be0 (patch) | |
| tree | 159eeb7ca43419f29926d6e77637db18bddd20a9 /app/services/system_note_service.rb | |
| parent | 8bdfee8ba5fb0a8f48501e63274c8f9ce5708007 (diff) | |
| download | gitlab-ce-08bbb9fce66cb46d3262e6cd4c4379b59f065be0.tar.gz | |
Add option to start a new discussion on an MR
Diffstat (limited to 'app/services/system_note_service.rb')
| -rw-r--r-- | app/services/system_note_service.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 35cfcc3682e..c9e25c7aaa2 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -228,12 +228,10 @@ module SystemNoteService def discussion_continued_in_issue(discussion, project, author, issue) body = "created #{issue.to_reference} to continue this discussion" + note_attributes = discussion.reply_attributes.merge(project: project, author: author, note: body) - note_params = discussion.reply_attributes.merge(project: project, author: author, note: body) - note_params[:type] = note_params.delete(:note_type) - - note = Note.create(note_params.merge(system: true)) - note.system_note_metadata = SystemNoteMetadata.new({ action: 'discussion' }) + note = Note.create(note_attributes.merge(system: true)) + note.system_note_metadata = SystemNoteMetadata.new(action: 'discussion') note end |