diff options
| author | Ewan Edwards <eedwards@perforce.com> | 2015-03-03 07:38:38 -0800 |
|---|---|---|
| committer | Ewan Edwards <eedwards@perforce.com> | 2015-03-04 07:24:36 -0800 |
| commit | fe6fb32fe6cc9836f92e169f3e1f5bb3dae8ffc8 (patch) | |
| tree | b383bdedf07482c0335e26d0357af40028fb0c30 /doc/integration/README.md | |
| parent | f04847a3c70c96c008498179f58db6aceb0c5d09 (diff) | |
| download | gitlab-ce-fe6fb32fe6cc9836f92e169f3e1f5bb3dae8ffc8.tar.gz | |
Moved the Gmail integration line into the list of available integrations.
Diffstat (limited to 'doc/integration/README.md')
| -rw-r--r-- | doc/integration/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md index d66467c4b1f..286bd34a0bd 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -8,11 +8,11 @@ See the documentation below for details on how to configure these services. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab, and Google via OAuth. - [Slack](slack.md) Integrate with the Slack chat service +- [OAuth2 provider](oauth_provider.md) OAuth2 application creation +- [Gmail](gitlab_buttons_in_gmail.md) Adds GitLab actions to messages GitLab Enterprise Edition contains [advanced JIRA support](http://doc.gitlab.com/ee/integration/jira.html) and [advanced Jenkins support](http://doc.gitlab.com/ee/integration/jenkins.html). -GitLab can also integrate with [Gmail](gitlab_buttons_in_gmail.md). - ## Project services Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, Pivotal Tracker, and Slack are available in the form of a Project Service. |