summaryrefslogtreecommitdiff
path: root/app/services/issuable_base_service.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-12 11:19:29 +0200
committerRémy Coutable <remy@rymai.me>2016-08-13 00:36:47 +0200
commitf393f2dde016edf63b5168eb63405f15d65803eb (patch)
tree12fc300a54c66a8b16b5d22000f493d92f03ba42 /app/services/issuable_base_service.rb
parentaadc5062ebe755aaf3fbb27fdd0af093770c9ce8 (diff)
downloadgitlab-ce-f393f2dde016edf63b5168eb63405f15d65803eb.tar.gz
Simplify the slash commands DSL to store action blocks instead of creating methods
Other improvements: - Ensure slash commands autocomplete doesn't break when noteable_type is not given - Slash commands: improve autocomplete behavior and /due command - We don't display slash commands for note edit forms. - Add tests for reply by email with slash commands - Be sure to execute slash commands after the note creation in Notes::CreateService Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r--app/services/issuable_base_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index c14bda811c2..1a01b333366 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -94,10 +94,10 @@ class IssuableBaseService < BaseService
end
def merge_slash_commands_into_params!(issuable)
- command_params = SlashCommands::InterpretService.new(project, current_user).
+ commands = SlashCommands::InterpretService.new(project, current_user).
execute(params[:description], issuable)
- params.merge!(command_params)
+ params.merge!(commands)
end
def create_issuable(issuable, attributes)