summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-07 17:09:58 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-07 17:09:58 +0000
commitc5e11d0405ce6f1b28af50e918af24cd330cfd65 (patch)
tree6877a25a479048f85fd27db4192471a4ff9993e1 /config
parent9c14954a81778a603a38024ce1f3f4953457d13f (diff)
parentd53690b6e5be2dd5372b10e3bdec4d7ae8c30242 (diff)
downloadgitlab-ce-c5e11d0405ce6f1b28af50e918af24cd330cfd65.tar.gz
Merge branch '34737-authentiq-oauth-feature-spec' into 'master'
Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 75d03de18a1..221e3d6e03b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -657,7 +657,10 @@ test:
client_id: 'YOUR_AUTH0_CLIENT_ID',
client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
namespace: 'YOUR_AUTH0_DOMAIN' } }
-
+ - { name: 'authentiq',
+ app_id: 'YOUR_CLIENT_ID',
+ app_secret: 'YOUR_CLIENT_SECRET',
+ args: { scope: 'aq:name email~rs address aq:push' } }
ldap:
enabled: false
servers: