diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-13 20:27:05 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-13 20:27:05 +0300 |
| commit | 1423d2382aa6250e37f847f33859701865535d6b (patch) | |
| tree | 8ebd077d329277cdeac219c2194162eda0d6508b /lib | |
| parent | 3967412f7e430d5a70560da8c7d6990a0aeec029 (diff) | |
| parent | 58e1a0898af6f1381411703f0d09342b0f77dd11 (diff) | |
Merge branch '57101-api-docs-for-hangouts-chat-service-incorrect' into 'master'
API: Fix docs and parameters for hangouts-chat service
Closes #57101
See merge request gitlab-org/gitlab-ce!25180
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/services.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 36bdba2d765..163c7505a65 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -368,8 +368,9 @@ module API name: :webhook, type: String, desc: 'The Hangouts Chat webhook. e.g. https://chat.googleapis.com/v1/spaces…' - } - ], + }, + CHAT_NOTIFICATION_EVENTS + ].flatten, 'irker' => [ { required: true, |