From 47e38e5c0e516c5c09017760f495c53155fe26c1 Mon Sep 17 00:00:00 2001 From: Ewan Edwards Date: Mon, 16 Feb 2015 11:16:23 -0800 Subject: [PATCH 1/4] The "GitLab buttons in Gmail" document was not linked from anywhere else. It is now linked. --- doc/integration/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/integration/README.md b/doc/integration/README.md index 1fc8ab997e..559a94533d 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -12,6 +12,8 @@ See the documentation below for details on how to configure these services. Jenkins support is [available in GitLab EE](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. From 4ecfcb4a1e05189372a72547103f1c2e9a23ab3b Mon Sep 17 00:00:00 2001 From: Ewan Edwards Date: Tue, 3 Mar 2015 07:38:38 -0800 Subject: [PATCH 2/4] Moved the Gmail integration line into the list of available integrations. --- doc/integration/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/integration/README.md b/doc/integration/README.md index 559a94533d..8f14c9d8b9 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -9,11 +9,10 @@ See the documentation below for details on how to configure these services. - [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 Jenkins support is [available in GitLab EE](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. From f04847a3c70c96c008498179f58db6aceb0c5d09 Mon Sep 17 00:00:00 2001 From: Ewan Edwards Date: Mon, 16 Feb 2015 11:16:23 -0800 Subject: [PATCH 3/4] The "GitLab buttons in Gmail" document was not linked from anywhere else. It is now linked. --- doc/integration/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/integration/README.md b/doc/integration/README.md index e5f33d8dee..d66467c4b1 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -11,6 +11,8 @@ See the documentation below for details on how to configure these services. 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. From fe6fb32fe6cc9836f92e169f3e1f5bb3dae8ffc8 Mon Sep 17 00:00:00 2001 From: Ewan Edwards Date: Tue, 3 Mar 2015 07:38:38 -0800 Subject: [PATCH 4/4] Moved the Gmail integration line into the list of available integrations. --- doc/integration/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/integration/README.md b/doc/integration/README.md index d66467c4b1..286bd34a0b 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.