diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-15 16:13:14 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-15 16:13:14 +0800 |
| commit | a065ee341c599f9500cd0b52a873cdb71a0bce55 (patch) | |
| tree | 28277b71118c7f7385add7c8ae4493f1d964305b /doc/integration/auth0.md | |
| parent | 188c231304845ff29506dc152aaea6ec42373015 (diff) | |
| parent | 1452729304393978ec93b712130dff6687db01b9 (diff) | |
| download | gitlab-ce-a065ee341c599f9500cd0b52a873cdb71a0bce55.tar.gz | |
Merge remote-tracking branch 'upstream/master' into use-update-runner-service
* upstream/master: (488 commits)
Remove duplicate CHANGELOG.md entries for 8.16.5
Update CHANGELOG.md for 8.14.9
Update CHANGELOG.md for 8.15.6
#27631: Add missing top-area div to activity header page
Update CHANGELOG.md for 8.16.5
Update CHANGELOG.md for 8.16.5
Update CHANGELOG.md for 8.16.5
Fix yarn lock and package.json mismatch caused by MR 9133
sync yarn.lock with recent changes to package.json
Add changelog
Fix z index bugs
Add Links to Branches in Calendar Activity
SidekiqStatus need to be qualified in some cases
Replace static fixture for behaviors/requires_input_spec.js (!9162)
API: Consolidate /projects endpoint
Add MySQL info in install requirements
Fix timezone on issue boards due date
Use Gitlab::Database.with_connection_pool from !9192
Disconnect the pool after done
Use threads directly, introduce pool later:
...
Diffstat (limited to 'doc/integration/auth0.md')
| -rw-r--r-- | doc/integration/auth0.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/integration/auth0.md b/doc/integration/auth0.md index e5247082a89..212b4854dd7 100644 --- a/doc/integration/auth0.md +++ b/doc/integration/auth0.md @@ -80,10 +80,13 @@ from step 5. 1. Change `YOUR_AUTH0_CLIENT_SECRET` to the client secret from the Auth0 Console page from step 5. -1. Save the file and [reconfigure GitLab](../administration/restart_gitlab.md) -for the changes to take effect. +1. [Reconfigure][] or [restart GitLab][] for the changes to take effect if you + installed GitLab via Omnibus or from source respectively. On the sign in page there should now be an Auth0 icon below the regular sign in form. Click the icon to begin the authentication process. Auth0 will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in. + +[reconfigure]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure +[restart GitLab]: ../administration/restart_gitlab.md#installations-from-source |