Commit 674e89f8 authored by Stan Hu's avatar Stan Hu

Merge branch '217421-note-getter' into 'master'

Use note getter instead of instance variable

See merge request gitlab-org/gitlab!36460
parents 56f3deb5 3cdac383
......@@ -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
......
......@@ -41,7 +41,7 @@ module Notes
@interpret_service = QuickActions::InterpretService.new(project, current_user, options)
@interpret_service.execute(note.note, note.noteable)
interpret_service.execute(note.note, note.noteable)
end
# Applies updates extracted to note#noteable
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment