diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-07-03 19:37:37 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-07-03 19:37:37 +0000 |
| commit | 9a0f5bd55bc9f1514909a59283fbc0651e11c127 (patch) | |
| tree | 42ddeb5c86f5d4e99152b81fe5425e4629d0a8e9 /config | |
| parent | 60cb3e910a5781b6afeb4edcbda425d604581153 (diff) | |
| download | gitlab-ce-9a0f5bd55bc9f1514909a59283fbc0651e11c127.tar.gz | |
Fix build for !11963.
- Don't use `request.env['omniauth.params']` if it isn't present.
- Remove the `saml` section from the `gitlab.yml` test section. Some tests
depend on this section not being initially present, so it can be overridden
in the test. This MR doesn't add any tests for SAML, so we didn't really need
this in the first place anyway.
- Clean up the test -> omniauth section of `gitlab.yml`
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b58a173bccb..950a58bb0dd 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -619,15 +619,12 @@ test: omniauth: enabled: true allow_single_sign_on: true - block_auto_created_users: false - auto_link_saml_user: true external_providers: [] providers: - { name: 'cas3', label: 'cas3', - args: { - url: 'https://sso.example.com', + args: { url: 'https://sso.example.com', disable_ssl_verification: false, login_url: '/cas/login', service_validate_url: '/cas/p3/serviceValidate', @@ -635,11 +632,7 @@ test: - { name: 'authentiq', app_id: 'YOUR_CLIENT_ID', app_secret: 'YOUR_CLIENT_SECRET', - args: { - scope: 'aq:name email~rs address aq:push' - } - } - + args: { scope: 'aq:name email~rs address aq:push' } } - { name: 'github', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET', @@ -663,24 +656,12 @@ test: - { name: 'twitter', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET' } - - - { name: 'saml', - label: 'Our SAML Provider', - groups_attribute: 'Groups', - external_groups: ['Contractors', 'Freelancers'], - args: { - assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback', - idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', - idp_sso_target_url: 'https://login.example.com/idp', - issuer: 'https://gitlab.example.com', - name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' - } } - - { name: 'auth0', args: { client_id: 'YOUR_AUTH0_CLIENT_ID', client_secret: 'YOUR_AUTH0_CLIENT_SECRET', namespace: 'YOUR_AUTH0_DOMAIN' } } + ldap: enabled: false servers: |