summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-21 17:37:55 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-21 17:37:55 +0100
commit7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6 (patch)
tree4a1114623ce0f0eb3d6ccc03a24b0039ed5572ba /doc/integration
parent8e3f1fa629a61741282214b293c1bc9438aada59 (diff)
downloadgitlab-ce-7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6.tar.gz
Add link to CAS doc
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/README.md1
-rw-r--r--doc/integration/cas.md6
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index eff39a626ae..50213f500b9 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -8,6 +8,7 @@ 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.
- [SAML](saml.md) Configure GitLab as a SAML 2.0 Service Provider
+- [CAS](cas.md) Configure GitLab to sign in using CAS
- [Slack](slack.md) Integrate with the Slack chat service
- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
- [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
diff --git a/doc/integration/cas.md b/doc/integration/cas.md
index 3490f6a38e0..e6b2071f193 100644
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -1,6 +1,6 @@
# CAS OmniAuth Provider
-To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL gitlab will supply to CAS. It should be something like: `https://gitlab.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
+To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://gitlab.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
1. On your GitLab server, open the configuration file.
@@ -10,7 +10,7 @@ To enable the CAS OmniAuth provider you must register your application with your
sudo editor /etc/gitlab/gitlab.rb
```
- For instalations from source:
+ For installations from source:
```sh
cd /home/git/gitlab
@@ -59,4 +59,4 @@ To enable the CAS OmniAuth provider you must register your application with your
1. Restart GitLab for the changes to take effect.
-On the sign in page there should now be a CAS tab in the sign in form. \ No newline at end of file
+On the sign in page there should now be a CAS tab in the sign in form.