Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-19 15:16:58 +0300
committerRémy Coutable <remy@rymai.me>2017-07-19 15:16:58 +0300
commit0579a89fb9aa93918760b2dd3eb6b7ae0eeea739 (patch)
tree0affe7f35a624b21194148e0606877dbec93c179 /config/gitlab.yml.example
parent312ed3f9a458ba76a738cf75da8e07954cedecdd (diff)
parent6bd94f20e30dfcba5273cd6e7415fb90914ab5a7 (diff)
Merge branch 'authentiq-updates' into 'master'
Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index d0ab2dab0af..cb007813b65 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -383,13 +383,13 @@ production: &base
# 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/
+ # # for client credentials (client ID and secret), go to https://www.authentiq.com/developers
# 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'
+ # # callback_url parameter is optional except when 'gitlab.host' in this file is set to 'localhost'
+ # # callback_url: 'YOUR_CALLBACK_URL'
# }
# }
# - { name: 'github',