diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-18 19:16:32 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-18 19:16:32 +0000 |
| commit | 549540f100b978f29a872af2a3bf74e81383de16 (patch) | |
| tree | a6cb01d47e11f1071ec8b97f11bf6a5b8eb1fb81 | |
| parent | 1524e2171aa4ab4bb1aab629c41b382dba77e143 (diff) | |
| parent | 6d747cfd3a41d6e2f396855ef7f29f400ea3f4a8 (diff) | |
| download | gitlab-ce-549540f100b978f29a872af2a3bf74e81383de16.tar.gz | |
Merge branch 'omniauth-config-sample-link' into 'master'
Add link to OmniAuth config sample for Omnibus
Added a link to the OmniAuth config sample for Omnibus installations.
See merge request !1335
| -rw-r--r-- | doc/integration/omniauth.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 00adae58dfa..15b4fb622af 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -7,6 +7,7 @@ OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) - [Initial OmniAuth Configuration](#initial-omniauth-configuration) - [Supported Providers](#supported-providers) - [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user) +- [OmniAuth configuration sample when using Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master#omniauth-google-twitter-github-login) ## Initial OmniAuth Configuration |