summaryrefslogtreecommitdiff
path: root/app/services/notes/create_service.rb
diff options
context:
space:
mode:
authorFelipe Artur <fcardozo@gitlab.com>2019-03-04 09:21:47 +0000
committerSean McGivern <sean@gitlab.com>2019-03-04 09:21:47 +0000
commit78dc1b58a64be03e6d3622aab5605e1d5f6a6643 (patch)
treed0dd8c328bb0c7ce2311c79f525f7f23db9e0ff0 /app/services/notes/create_service.rb
parent4b0036b87ee30ce0a3687dd052514b571f4d520f (diff)
downloadgitlab-ce-78dc1b58a64be03e6d3622aab5605e1d5f6a6643.tar.gz
Show commands applied message when promoting issues
Fix 'commands applied' messages not being shown when issue is promoted to epic using slash commands.
Diffstat (limited to 'app/services/notes/create_service.rb')
-rw-r--r--app/services/notes/create_service.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 5a6e7338b42..1b46f6d8a72 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -21,7 +21,7 @@ module Notes
if quick_actions_service.supported?(note)
options = { merge_request_diff_head_sha: merge_request_diff_head_sha }
- content, command_params = quick_actions_service.extract_commands(note, options)
+ content, update_params = quick_actions_service.execute(note, options)
only_commands = content.empty?
@@ -43,16 +43,17 @@ module Notes
Suggestions::CreateService.new(note).execute
end
- if command_params.present?
- quick_actions_service.execute(command_params, note)
+ if quick_actions_service.commands_executed_count.to_i > 0
+ if update_params.present?
+ quick_actions_service.apply_updates(update_params, note)
+ note.commands_changes = update_params
+ end
# We must add the error after we call #save because errors are reset
# when #save is called
if only_commands
note.errors.add(:commands_only, 'Commands applied')
end
-
- note.commands_changes = command_params
end
note