diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-19 08:43:35 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-25 19:23:54 +0300 |
| commit | 5a5db0508a4dad5f0ddda6f3565152e00faebc47 (patch) | |
| tree | 92d5a07ccd7eb31a185fc57ec9b4e39a9436b0a8 /lib | |
| parent | c22cced31eedca5343552f64d5eaaff90d010bb2 (diff) | |
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
(cherry picked from commit 51267258d1c39835c995eaaf29b7df678334ded1)
d5d2f8fb 59702 Fix API notification flags for MS Teams
f7658c0f 59702 Add changelog entry
1ce2c4dc Add missing test for Microsoft Teams notify_only_default_branch flag
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, |