diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-21 17:38:37 +0100 |
| commit | 9832e60ffb801427453301c6da4675f81518cdeb (patch) | |
| tree | dc8e1b7692be8cde7e57b7059de23385e177beed /config/initializers/1_settings.rb | |
| parent | e209ba7002238459b56ced1f5b4a7ce8bd6e2b8b (diff) | |
| parent | 7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6 (diff) | |
| download | gitlab-ce-9832e60ffb801427453301c6da4675f81518cdeb.tar.gz | |
Merge branch 'tduehr/gitlab-ce-cas-support'
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index d3d27c762aa..1043fc01ab1 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -126,6 +126,10 @@ Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block Settings.omniauth['auto_link_ldap_user'] = false if Settings.omniauth['auto_link_ldap_user'].nil? Settings.omniauth['providers'] ||= [] +Settings.omniauth['cas3'] ||= Settingslogic.new({}) +Settings.omniauth.cas3['session_duration'] ||= 8.hours +Settings.omniauth['session_tickets'] ||= Settingslogic.new({}) +Settings.omniauth.session_tickets['cas3'] = 'ticket' Settings['shared'] ||= Settingslogic.new({}) Settings.shared['path'] = File.expand_path(Settings.shared['path'] || "shared", Rails.root) |