Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 0 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 7dd6cd9a87c..968d0414392 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -21,6 +21,8 @@ module Notes
       # only, there is no need be create a note!
 
       execute_quick_actions(note) do |only_commands|
+        note.check_for_spam(action: :create, user: current_user) unless only_commands
+
         note.run_after_commit do
           # Finish the harder work in the background
           NewNoteWorker.perform_async(note.id)
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 92b41bb4cc7..ff9f39ce0be 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -25,6 +25,7 @@ module Notes
 
       if note.note_changed?
         note.assign_attributes(last_edited_at: Time.current, updated_by: current_user)
+        note.check_for_spam(action: :update, user: current_user) unless only_commands
       end
 
       note.save