deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2346 from sodabrew/omniauth_configs

Browse source 
Allow the OmniAuth provider args parameter to be passed through
This commit is contained in:
Riyad Preukschas 2013-01-16 15:58:53 -08:00
commit 9f1e9f11f1
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/initializers/devise.rb
View file

@ -217,6 +217,15 @@ Devise.setup do |config|
end
Gitlab.config.omniauth.providers.each do |provider|
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
case provider['args']
when Array
# An Array from the configuration will be expanded.
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], *provider['args']
when Hash
# A Hash from the configuration will be passed as is.
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], provider['args']
else
config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
end
end
end