summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/README.md6
-rw-r--r--doc/integration/external-issue-tracker.md32
-rw-r--r--doc/integration/jira.md4
-rw-r--r--doc/integration/slack.md2
4 files changed, 5 insertions, 39 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index c2fd299db07..e279a114f4b 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -5,10 +5,8 @@ trackers and external authentication.
See the documentation below for details on how to configure these services.
-- [Jira](../project_services/jira.md) Integrate with the JIRA issue tracker
-- [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
- [LDAP](ldap.md) Set up sign in via LDAP
-- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure
+- [OmniAuth](omniauth.md) Sign in via CAS, Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure
- [SAML](saml.md) Configure GitLab as a SAML 2.0 Service Provider
- [CAS](cas.md) Configure GitLab to sign in using CAS
- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
@@ -27,7 +25,7 @@ GitLab Enterprise Edition contains [advanced Jenkins support][jenkins].
Integration with services such as Campfire, Flowdock, Gemnasium, HipChat,
Pivotal Tracker, and Slack are available in the form of a [Project Service][].
-[Project Service]: ../project_services/project_services.md
+[Project Service]: ../../user/project/services.md
## SSL certificate errors
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 8d2c6351fb8..ec50b49a490 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -1,31 +1 @@
-# External issue tracker
-
-GitLab has a great issue tracker but you can also use an external one such as
-Jira, Redmine, or Bugzilla. Issue trackers are configurable per GitLab project and allow
-you to do the following:
-
-- the **Issues** link on the GitLab project pages takes you to the appropriate
- issue index of the external tracker
-- clicking **New issue** on the project dashboard creates a new issue on the
- external tracker
-
-## Configuration
-
-The configuration is done via a project's **Services**.
-
-### Project Service
-
-To enable an external issue tracker you must configure the appropriate **Service**.
-Visit the links below for details:
-
-- [Redmine](../project_services/redmine.md)
-- [Jira](../project_services/jira.md)
-- [Bugzilla](../project_services/bugzilla.md)
-
-### Service Template
-
-To save you the hassle from configuring each project's service individually,
-GitLab provides the ability to set Service Templates which can then be
-overridden in each project's settings.
-
-Read more on [Services Templates](../project_services/services_templates.md).
+This document was moved to [user/project/services/external_issue_tracker.md](../user/project/services/external_issue_tracker.md).
diff --git a/doc/integration/jira.md b/doc/integration/jira.md
index 78aa6634116..ae1f7a0b0bc 100644
--- a/doc/integration/jira.md
+++ b/doc/integration/jira.md
@@ -1,3 +1 @@
-# GitLab JIRA integration
-
-This document was moved under [project_services/jira](../project_services/jira.md).
+This document was moved to [user/project/services/jira](../user/project/services/jira.md).
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 8cd151fbf95..b25667b4d2b 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -1 +1 @@
-This document was moved to [project_services/slack.md](../project_services/slack.md).
+This document was moved to [user/project/services/slack.md](../user/project/services/slack.md).