diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-20 11:32:31 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-20 11:32:31 +0100 |
| commit | 0d224376cfaf61d6c9050367c0098ba87dfe8c58 (patch) | |
| tree | eac7276123b1fa45e3d11ed3aede881b0366b18e /lib/api | |
| parent | f7b7e918fef6567d26e7fe17894e5df14c58f37c (diff) | |
| parent | deb74f73d9432c90649142cf8333c5cd5d0984ea (diff) | |
| download | gitlab-ce-0d224376cfaf61d6c9050367c0098ba87dfe8c58.tar.gz | |
Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config
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, |