diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/services/notes/post_process_service.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/services/notes/post_process_service.rb')
-rw-r--r-- | app/services/notes/post_process_service.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb index 0e455c641ce..4f3b2000e9a 100644 --- a/app/services/notes/post_process_service.rb +++ b/app/services/notes/post_process_service.rb @@ -10,13 +10,13 @@ module Notes def execute # Skip system notes, like status changes and cross-references and awards - unless @note.system? - EventCreateService.new.leave_note(@note, @note.author) + unless note.system? + EventCreateService.new.leave_note(note, note.author) - return if @note.for_personal_snippet? + return if note.for_personal_snippet? - @note.create_cross_references! - ::SystemNoteService.design_discussion_added(@note) if create_design_discussion_system_note? + note.create_cross_references! + ::SystemNoteService.design_discussion_added(note) if create_design_discussion_system_note? execute_note_hooks end @@ -25,21 +25,21 @@ module Notes private def create_design_discussion_system_note? - @note && @note.for_design? && @note.start_of_discussion? + note && note.for_design? && note.start_of_discussion? end def hook_data - Gitlab::DataBuilder::Note.build(@note, @note.author) + Gitlab::DataBuilder::Note.build(note, note.author) end def execute_note_hooks - return unless @note.project + return unless note.project note_data = hook_data - hooks_scope = @note.confidential?(include_noteable: true) ? :confidential_note_hooks : :note_hooks + hooks_scope = note.confidential?(include_noteable: true) ? :confidential_note_hooks : :note_hooks - @note.project.execute_hooks(note_data, hooks_scope) - @note.project.execute_services(note_data, hooks_scope) + note.project.execute_hooks(note_data, hooks_scope) + note.project.execute_services(note_data, hooks_scope) end end end |