diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-17 11:13:16 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-17 11:13:16 +0100 |
| commit | 481e73fb76bbdc845ba6899682ab5fa8c05b11bc (patch) | |
| tree | 70becb0067bba3e9f529e81a3bca9608408929a9 /config/gitlab.yml.example | |
| parent | 48274581551b73575149463be0c050f6b5a564ee (diff) | |
| parent | 4171933c0963696626c879c2d05afa1594a71d99 (diff) | |
| download | gitlab-ce-481e73fb76bbdc845ba6899682ab5fa8c05b11bc.tar.gz | |
Merge branch 'master' into new-branch-button-issue
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 05f127d622a..500b745f55e 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -357,6 +357,12 @@ production: &base # crowd_server_url: 'CROWD SERVER URL', # application_name: 'YOUR_APP_NAME', # application_password: 'YOUR_APP_PASSWORD' } } + # + # - { name: 'auth0', + # args: { + # client_id: 'YOUR_AUTH0_CLIENT_ID', + # client_secret: 'YOUR_AUTH0_CLIENT_SECRET', + # namespace: 'YOUR_AUTH0_DOMAIN' } } # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours. # cas3: |