summaryrefslogtreecommitdiff
path: root/app/services/notes
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-04-05 12:41:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-04-05 12:41:01 +0000
commit63a1a57024e54ff6aee1f099ca7b431a7bb0e669 (patch)
tree2cc4cf8dc4fe6a874edfe763d9a498cb41f7f457 /app/services/notes
parentf9607db7a4db87b07ed2f2634794f99084a6534d (diff)
parentc1946364707947f56048cc00caa6d67fe635f3c7 (diff)
downloadgitlab-ce-63a1a57024e54ff6aee1f099ca7b431a7bb0e669.tar.gz
Merge branch 'jprovazn-comment-refs' into 'master'
Better group support in notes-related code See merge request gitlab-org/gitlab-ce!18150
Diffstat (limited to 'app/services/notes')
-rw-r--r--app/services/notes/post_process_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index f0cab2ade6d..199b8028dbc 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -11,7 +11,7 @@ module Notes
unless @note.system?
EventCreateService.new.leave_note(@note, @note.author)
- return unless @note.for_project_noteable?
+ return if @note.for_personal_snippet?
@note.create_cross_references!
execute_note_hooks
@@ -23,6 +23,8 @@ module Notes
end
def execute_note_hooks
+ return unless @note.project
+
note_data = hook_data
hooks_scope = @note.confidential? ? :confidential_note_hooks : :note_hooks