diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 11:59:27 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 11:59:27 +0000 |
| commit | c6709c52090871cbe7d393844deade64600711e1 (patch) | |
| tree | 6c9b9ff8ad126c31f2cb9129d7392ab50a670462 | |
| parent | 9d1ce06e36d5482b4842f31807a0afd9144be71c (diff) | |
| parent | 63689d73f920795874f5055183c3e862dcaac22a (diff) | |
| download | gitlab-ce-c6709c52090871cbe7d393844deade64600711e1.tar.gz | |
Merge branch 'docs/mention-microsoft-teams' into 'master'
Mention Microsoft teams service in project services doc
See merge request !10815
| -rw-r--r-- | doc/user/project/integrations/microsoft_teams.md | 6 | ||||
| -rw-r--r-- | doc/user/project/integrations/project_services.md | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/user/project/integrations/microsoft_teams.md b/doc/user/project/integrations/microsoft_teams.md index fbf9c1de443..eaad2d5138a 100644 --- a/doc/user/project/integrations/microsoft_teams.md +++ b/doc/user/project/integrations/microsoft_teams.md @@ -1,8 +1,8 @@ -# Microsoft Teams Service +# Microsoft Teams service ## On Microsoft Teams -To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://msdn.microsoft.com/en-us/microsoft-teams/connectors) +To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://msdn.microsoft.com/en-us/microsoft-teams/connectors). ## On GitLab @@ -30,4 +30,4 @@ At the end fill in your Microsoft Teams details: After you are all done, click **Save changes** for the changes to take effect. -
\ No newline at end of file + diff --git a/doc/user/project/integrations/project_services.md b/doc/user/project/integrations/project_services.md index 25400633de5..96c91093d7d 100644 --- a/doc/user/project/integrations/project_services.md +++ b/doc/user/project/integrations/project_services.md @@ -47,6 +47,7 @@ Click on the service links to see further configuration instructions and details | [Kubernetes](kubernetes.md) | A containerized deployment service | | [Mattermost slash commands](mattermost_slash_commands.md) | Mattermost chat and ChatOps slash commands | | [Mattermost Notifications](mattermost.md) | Receive event notifications in Mattermost | +| [Microsoft teams](microsoft_teams.md) | Receive notifications for actions that happen on GitLab into a room on Microsoft Teams using Office 365 Connectors | | Pipelines emails | Email the pipeline status to a list of recipients | | [Slack Notifications](slack.md) | Receive event notifications in Slack | | [Slack slash commands](slack_slash_commands.md) | Slack chat and ChatOps slash commands | |