diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-22 20:22:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 20:22:18 +0100 |
| commit | 9f56511860493b770c2e535be0f8ce4777c8d373 (patch) | |
| tree | 681e3e5a0c0206210e71a187a11c010646d82050 /config | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
| parent | edd54411124b271622d7a2af4efdfe1a0a35cac4 (diff) | |
Merge pull request #965 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/omniauth.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 254e751d4..e8d7697a1 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -14,7 +14,7 @@ Devise.setup do |config| cas_options[:host] = ENV['CAS_HOST'] if ENV['CAS_HOST'] cas_options[:port] = ENV['CAS_PORT'] if ENV['CAS_PORT'] cas_options[:ssl] = ENV['CAS_SSL'] == 'true' if ENV['CAS_SSL'] - cas_options[:validate_url] = ENV['CAS_VALIDATE_URL'] if ENV['CAS_VALIDATE_URL'] + cas_options[:service_validate_url] = ENV['CAS_VALIDATE_URL'] if ENV['CAS_VALIDATE_URL'] cas_options[:callback_url] = ENV['CAS_CALLBACK_URL'] if ENV['CAS_CALLBACK_URL'] cas_options[:logout_url] = ENV['CAS_LOGOUT_URL'] if ENV['CAS_LOGOUT_URL'] cas_options[:login_url] = ENV['CAS_LOGIN_URL'] if ENV['CAS_LOGIN_URL'] |