diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-06 19:37:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-06 19:37:25 +0000 |
| commit | 00e00cacf8cb4ce3bfb733bae47e7e594e91e294 (patch) | |
| tree | 607671987a66dbb16d49738aef22616c13b6936b /lib/api | |
| parent | 73cb71e41c0ade92b9673a5d74c7dd78679fae91 (diff) | |
| parent | 1f404065ca602593dc18aa051515fd88132ddfdf (diff) | |
| download | gitlab-ce-00e00cacf8cb4ce3bfb733bae47e7e594e91e294.tar.gz | |
Merge branch 'microsoft-teams-integration' into 'master'
adds initial microsoft teams integration
See merge request !10412
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/services.rb | 9 | ||||
| -rw-r--r-- | lib/api/v3/services.rb | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 6802a99311e..65f86caaa51 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -488,6 +488,14 @@ module API desc: 'The channel name' } ], + 'microsoft-teams' => [ + { + required: true, + name: :webhook, + type: String, + desc: 'The Microsoft Teams webhook. e.g. https://outlook.office.com/webhook/…' + } + ], 'mattermost' => [ { required: true, @@ -550,6 +558,7 @@ module API RedmineService, SlackService, MattermostService, + MicrosoftTeamsService, TeamcityService, ] diff --git a/lib/api/v3/services.rb b/lib/api/v3/services.rb index 3bacaeee032..bbe07ed4212 100644 --- a/lib/api/v3/services.rb +++ b/lib/api/v3/services.rb @@ -501,6 +501,12 @@ module API desc: 'The channel name' } ], + 'microsoft-teams' => [ + required: true, + name: :webhook, + type: String, + desc: 'The Microsoft Teams webhook. e.g. https://outlook.office.com/webhook/…' + ], 'mattermost' => [ { required: true, |