diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-07 14:20:03 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-07 14:20:03 +0300 |
| commit | 954dd7ce876330446698b32faa0f42659791336a (patch) | |
| tree | 91727b9075355e21c1fdf9d8191c3378aef17122 /config | |
| parent | 0fbd6244ec8d06376b4130a4832dd77ce207fc5f (diff) | |
| parent | 9836017c709ee5179575647e8d93065eeb854137 (diff) | |
Merge branch 'crowd' into 'master'
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c7b60a1d4b1..9eb99dae456 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -246,6 +246,11 @@ production: &base # issuer: 'https://gitlab.example.com', # name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' # } } + # - { name: 'crowd', + # args: { + # crowd_server_url: 'CROWD SERVER URL', + # application_name: 'YOUR_APP_NAME', + # application_password: 'YOUR_APP_PASSWORD' } } diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 091548348b1..2ce24592f8b 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -238,7 +238,7 @@ Devise.setup do |config| provider_arguments.concat provider['args'] when Hash # A Hash from the configuration will be passed as is. - provider_arguments << provider['args'] + provider_arguments << provider['args'].symbolize_keys end config.omniauth provider['name'].to_sym, *provider_arguments |