diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:32:53 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:32:53 +0000 |
commit | 352a9ed56213b6f83a679e72f9554638a0aed1ee (patch) | |
tree | 04ac45d05a67dfd71ff325ed45c8ffacaf9ec23b /app/services/issuable_base_service.rb | |
parent | c6701d45474acab6a2d687d2e2ffdaac5c0d5491 (diff) | |
parent | ea090291bba6bb665b3631cc5a2659e6673a6959 (diff) | |
download | gitlab-ce-352a9ed56213b6f83a679e72f9554638a0aed1ee.tar.gz |
Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'
Rename "Slash commands" to "Quick actions"
Closes #27070
See merge request !11811
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r-- | app/services/issuable_base_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index cd4d180824f..c8db4728aea 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -142,9 +142,9 @@ class IssuableBaseService < BaseService LabelsFinder.new(current_user, project_id: @project.id).execute end - def merge_slash_commands_into_params!(issuable) + def merge_quick_actions_into_params!(issuable) description, command_params = - SlashCommands::InterpretService.new(project, current_user). + QuickActions::InterpretService.new(project, current_user). execute(params[:description], issuable) # Avoid a description already set on an issuable to be overwritten by a nil @@ -162,7 +162,7 @@ class IssuableBaseService < BaseService end def create(issuable) - merge_slash_commands_into_params!(issuable) + merge_quick_actions_into_params!(issuable) filter_params(issuable) params.delete(:state_event) |