diff options
author | Rémy Coutable <remy@rymai.me> | 2016-12-21 11:58:05 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-21 11:58:05 +0000 |
commit | 0ba41ea1c8e9d99667401c2778c7c320b96c35e0 (patch) | |
tree | 9f887505f6e97ebb7b8de939e9227a6b950484f6 /config | |
parent | 0ad0aa42eb9c1b51a406173438b686458d9dc87e (diff) | |
parent | 6e186b76bb22c5803e3d7105f8ff78c11128812d (diff) | |
download | gitlab-ce-0ba41ea1c8e9d99667401c2778c7c320b96c35e0.tar.gz |
Merge branch 'authentiq-id-oauth-support' into 'master'
Added support for Authentiq OAuth provider
See merge request !8038
Diffstat (limited to 'config')
-rw-r--r-- | config/gitlab.yml.example | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b8b41a0d86c..2d1d48bf9da 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -368,6 +368,16 @@ production: &base # login_url: '/cas/login', # service_validate_url: '/cas/p3/serviceValidate', # logout_url: '/cas/logout'} } + # - { name: 'authentiq', + # # for client credentials (client ID and secret), go to https://www.authentiq.com/ + # app_id: 'YOUR_CLIENT_ID', + # app_secret: 'YOUR_CLIENT_SECRET', + # args: { + # scope: 'aq:name email~rs address aq:push' + # # redirect_uri parameter is optional except when 'gitlab.host' in this file is set to 'localhost' + # # redirect_uri: 'YOUR_REDIRECT_URI' + # } + # } # - { name: 'github', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', |