diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-20 09:41:37 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2016-12-20 09:41:37 +0000 |
commit | 52278412c7350b8087ef4ffc688c79e4593369cc (patch) | |
tree | 8f6769b3563db7c5d8ebaf01e2b1e939579913e6 /lib/api | |
parent | 7572a31430cd4dbd6ed8d3da5f06010858d7c487 (diff) | |
parent | e06f88effa842c73d3827593f8d28846207bfca0 (diff) | |
download | gitlab-ce-52278412c7350b8087ef4ffc688c79e4593369cc.tar.gz |
Merge branch 'zj-kamil-slack-slash-commands' into 'master'
Slack slash commands
## What does this MR do?
Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements.
## Why was this MR needed?
We want to expose Slack Slash Commands as a first-class service.
## What are the relevant issue numbers?
Supersedes !8007
Closes #22182
See merge request !8126
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/services.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 59232c84c24..aa97f6af0b2 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -378,7 +378,6 @@ module API desc: 'A custom certificate authority bundle to verify the Kubernetes cluster with (PEM format)' }, ], - 'mattermost-slash-commands' => [ { required: true, @@ -387,6 +386,14 @@ module API desc: 'The Mattermost token' } ], + 'slack-slash-commands' => [ + { + required: true, + name: :token, + type: String, + desc: 'The Slack token' + } + ], 'pipelines-email' => [ { required: true, |