diff options
| author | Seiji Suenaga <seijisuenaga@gmail.com> | 2019-06-18 23:05:41 +0000 |
|---|---|---|
| committer | Seiji Suenaga <SSuenaga@balanceinnovations.com> | 2019-06-18 19:45:35 -0500 |
| commit | d5d2f8fb6b3452cd1ebac1e006728e8dcb74b3d6 (patch) | |
| tree | f03052d944d888311b675fb5fcd73cb7ffd2be98 | |
| parent | 5ee6771c60fd36081bf95f4f577a3406197a61b9 (diff) | |
| download | gitlab-ce-d5d2f8fb6b3452cd1ebac1e006728e8dcb74b3d6.tar.gz | |
59702 Fix API notification flags for MS Teams
| -rw-r--r-- | doc/api/services.md | 2 | ||||
| -rw-r--r-- | lib/api/helpers/services_helpers.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/api/services.md b/doc/api/services.md index f38f96f64ad..042fee4a21a 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -1023,6 +1023,8 @@ Parameters: | Parameter | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `webhook` | string | true | The Microsoft Teams webhook. For example, `https://outlook.office.com/webhook/...` | +| `notify_only_broken_pipelines` | boolean | false | Send notifications for broken pipelines | +| `notify_only_default_branch` | boolean | false | Send notifications only for the default branch | | `push_events` | boolean | false | Enable notifications for push events | | `issues_events` | boolean | false | Enable notifications for issue events | | `confidential_issues_events` | boolean | false | Enable notifications for confidential issue events | 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, |