Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml

+---
+title: Fix missing API notification flags for Microsoft Teams
+merge_request: 29824
+author: Seiji Suenaga
+type: fixed

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 |

doc/ci/pipelines.md

@@ -139,7 +139,7 @@ The union of A, B, and C is (1, 4) and (6, 7). Therefore, the total running time
 (4 - 1) + (7 - 6) => 4
 ```
 
-## Expanding and collapsing job log sections
+### Expanding and collapsing job log sections
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/14664) in GitLab
 > 12.0.

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,

spec/models/project_services/microsoft_teams_service_spec.rb

@@ -289,6 +289,18 @@ describe MicrosoftTeamsService do
           expect(result).to be_falsy
         end
       end
+
+      context 'when disabled' do
+        let(:pipeline) do
+          create(:ci_pipeline, :failed, project: project, ref: 'not-the-default-branch')
+        end
+
+        before do
+          chat_service.notify_only_default_branch = false
+        end
+
+        it_behaves_like 'call Microsoft Teams API'
+      end
     end
   end
 end