diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-05 11:09:26 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-05 11:09:26 +0000 |
| commit | b1cd9add2385b381b54af9259e49d8a39e110e0b (patch) | |
| tree | 9e1152a055fd490139d58d6895f5bedf0ff96980 /lib | |
| parent | aec04a47c16665f1dfb1fb61647c3f78a4dde20f (diff) | |
| parent | dfca704d6a30db04f4d9bb0d246198dca04a638c (diff) | |
| download | gitlab-ce-b1cd9add2385b381b54af9259e49d8a39e110e0b.tar.gz | |
Merge branch 'zj-404-slack-error' into 'master'
Add API route slack slash commands
Closes #25954
See merge request !8362
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/services.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index d11cdce4e18..3a9dfbb237c 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -543,6 +543,13 @@ module API type: String, desc: 'The Mattermost token' } + ], + 'slack-slash-commands' => [ + { + name: :token, + type: String, + desc: 'The Slack token' + } ] }.freeze |