diff options
Diffstat (limited to 'app/services/notes')
| -rw-r--r-- | app/services/notes/create_service.rb | 16 | ||||
| -rw-r--r-- | app/services/notes/post_process_service.rb | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 01586994813..02fca5c0ea3 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -5,7 +5,12 @@ module Notes note.author = current_user note.system = false - return unless valid_project?(note) + if note.award_emoji? + noteable = note.noteable + todo_service.new_award_emoji(noteable, current_user) + + return noteable.create_award_emoji(note.award_emoji_name, current_user) + end if note.save # Finish the harder work in the background @@ -15,14 +20,5 @@ module Notes note end - - private - - def valid_project?(note) - return false unless project - return true if note.for_commit? - - note.noteable.try(:project) == project - end end end diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb index e818f58d13c..534c48aefff 100644 --- a/app/services/notes/post_process_service.rb +++ b/app/services/notes/post_process_service.rb @@ -8,7 +8,7 @@ module Notes def execute # Skip system notes, like status changes and cross-references and awards - unless @note.system || @note.is_award + unless @note.system? EventCreateService.new.leave_note(@note, @note.author) @note.create_cross_references! execute_note_hooks |