diff options
author | Regis <boudinot.regis@yahoo.com> | 2016-12-16 09:50:23 -0700 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2016-12-16 09:50:23 -0700 |
commit | 211ee4b97c0754f30ff018d9a333e72559661a05 (patch) | |
tree | c97c0c517ca205d30629d337669a9870ca7752ed /lib/api/services.rb | |
parent | 27a4aef5848d36b38c861c952a098f85562a31df (diff) | |
parent | ae71032d0af1730c359089f3edc9029a8b5c8acc (diff) | |
download | gitlab-ce-211ee4b97c0754f30ff018d9a333e72559661a05.tar.gz |
Merge branch 'master' into auto-pipelines-vue
Diffstat (limited to 'lib/api/services.rb')
-rw-r--r-- | lib/api/services.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index b1e072b4f47..59232c84c24 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -473,7 +473,7 @@ module API desc: 'The description of the tracker' } ], - 'slack' => [ + 'slack-notification' => [ { required: true, name: :webhook, @@ -493,6 +493,14 @@ module API desc: 'The channel name' } ], + 'mattermost-notification' => [ + { + required: true, + name: :webhook, + type: String, + desc: 'The Mattermost webhook. e.g. http://mattermost_host/hooks/...' + } + ], 'teamcity' => [ { required: true, |