diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-19 05:43:35 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-19 05:43:35 +0000 |
| commit | 51267258d1c39835c995eaaf29b7df678334ded1 (patch) | |
| tree | 0d04c9d1a9c2c7e79d3cb8f5a953064c2a3e7e39 /lib | |
| parent | 0cd04bf35fd93a787afbf90da3284e8ecdfe424f (diff) | |
| parent | 1ce2c4dcafce0aa7338647001b3c2b13b721640a (diff) | |
| download | gitlab-ce-51267258d1c39835c995eaaf29b7df678334ded1.tar.gz | |
Merge branch 'fix-microsoft-teams-notification-flags' into 'master'
Fix missing API notification flags for Microsoft Teams
See merge request gitlab-org/gitlab-ce!29824
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/services_helpers.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb index 44c577204b8..cf2e9d01356 100644 --- a/lib/api/helpers/services_helpers.rb +++ b/lib/api/helpers/services_helpers.rb @@ -683,8 +683,9 @@ module API name: :webhook, type: String, desc: 'The Microsoft Teams webhook. e.g. https://outlook.office.com/webhook/…' - } - ], + }, + chat_notification_flags + ].flatten, 'mattermost' => [ chat_notification_settings, chat_notification_flags, |