Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-13 04:17:18 +0300
committerDouwe Maan <douwe@selenight.nl>2016-08-13 04:17:18 +0300
commit5a07b760dff04660d9c7da84852c710b1fc2f786 (patch)
tree6aa67c32c6b80dcc1c7cbfe4f9f62e57edb76b3e /app/services/issuable_base_service.rb
parent5d4993d62357e438b6211247278025040f3ae382 (diff)
Refactor slash command definition
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r--app/services/issuable_base_service.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 1a01b333366..aa08eef081c 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -94,10 +94,13 @@ class IssuableBaseService < BaseService
end
def merge_slash_commands_into_params!(issuable)
- commands = SlashCommands::InterpretService.new(project, current_user).
+ description, command_params =
+ SlashCommands::InterpretService.new(project, current_user).
execute(params[:description], issuable)
- params.merge!(commands)
+ params[:description] = description
+
+ params.merge!(command_params)
end
def create_issuable(issuable, attributes)