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 /lib/api | |
| 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 'lib/api')
| -rw-r--r-- | lib/api/services.rb | 4 | ||||
| -rw-r--r-- | lib/api/v3/services.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 47bd9940f77..7488f95a9b7 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -685,7 +685,7 @@ module API trigger_services.each do |service_slug, settings| helpers do - def chat_command_service(project, service_slug, params) + def slash_command_service(project, service_slug, params) project.services.active.where(template: false).find do |service| service.try(:token) == params[:token] && service.to_param == service_slug.underscore end @@ -710,7 +710,7 @@ module API # This is not accurate, but done to prevent leakage of the project names not_found!('Service') unless project - service = chat_command_service(project, service_slug, params) + service = slash_command_service(project, service_slug, params) result = service.try(:trigger, params) if result diff --git a/lib/api/v3/services.rb b/lib/api/v3/services.rb index 118c6df6549..2d13d6fabfd 100644 --- a/lib/api/v3/services.rb +++ b/lib/api/v3/services.rb @@ -608,7 +608,7 @@ module API trigger_services.each do |service_slug, settings| helpers do - def chat_command_service(project, service_slug, params) + def slash_command_service(project, service_slug, params) project.services.active.where(template: false).find do |service| service.try(:token) == params[:token] && service.to_param == service_slug.underscore end @@ -633,7 +633,7 @@ module API # This is not accurate, but done to prevent leakage of the project names not_found!('Service') unless project - service = chat_command_service(project, service_slug, params) + service = slash_command_service(project, service_slug, params) result = service.try(:trigger, params) if result |