Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index d32d1c8ca12..ff94f4c1451 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -45,13 +45,13 @@ module Notes
     def execute_quick_actions(note)
       return yield(false) unless quick_actions_supported?(note)
 
-      content, update_params, message = quick_actions_service.execute(note, quick_action_options)
+      content, update_params, message, command_names = quick_actions_service.execute(note, quick_action_options)
       only_commands = content.empty?
       note.note = content
 
       yield(only_commands)
 
-      do_commands(note, update_params, message, only_commands)
+      do_commands(note, update_params, message, command_names, only_commands)
     end
 
     def quick_actions_supported?(note)
@@ -84,7 +84,7 @@ module Notes
       end
     end
 
-    def do_commands(note, update_params, message, only_commands)
+    def do_commands(note, update_params, message, command_names, only_commands)
       return if quick_actions_service.commands_executed_count.to_i == 0
 
       if update_params.present?
@@ -96,6 +96,7 @@ module Notes
       # when #save is called
       if only_commands
         note.errors.add(:commands_only, message.presence || _('Failed to apply commands.'))
+        note.errors.add(:command_names, command_names.flatten)
         # Allow consumers to detect problems applying commands
         note.errors.add(:commands, _('Failed to apply commands.')) unless message.present?
       end