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
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-09 16:19:27 +0300
committerRémy Coutable <remy@rymai.me>2017-11-09 16:19:27 +0300
commitae434cccb2de4dacd5741b334869b7ee2d41849e (patch)
tree26a448ad57cd9a12cd98ead5741657c45e43c6fa /lib
parent43d98cd1ff3ea0dd6a794ba4d1d621415d439985 (diff)
parent12d622eb996b6499e5fbd2be01cca27c08a976fa (diff)
Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'
Fix acceptance of username for Mattermost service update Closes #39895 See merge request gitlab-org/gitlab-ce!15275
Diffstat (limited to 'lib')
-rw-r--r--lib/api/services.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 6454e475036..bbcc851d07a 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -522,6 +522,12 @@ module API
name: :webhook,
type: String,
desc: 'The Mattermost webhook. e.g. http://mattermost_host/hooks/...'
+ },
+ {
+ required: false,
+ name: :username,
+ type: String,
+ desc: 'The username to use to post the message'
}
],
'teamcity' => [