Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-01-05 14:09:26 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2017-01-05 14:09:26 +0300
commitb1cd9add2385b381b54af9259e49d8a39e110e0b (patch)
tree9e1152a055fd490139d58d6895f5bedf0ff96980 /lib/api
parentaec04a47c16665f1dfb1fb61647c3f78a4dde20f (diff)
parentdfca704d6a30db04f4d9bb0d246198dca04a638c (diff)
Merge branch 'zj-404-slack-error' into 'master'
Add API route slack slash commands Closes #25954 See merge request !8362
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/services.rb7
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