diff options
| author | Edouard Maffert | 2016-09-09 10:13:18 +0200 |
|---|---|---|
| committer | Edouard Maffert | 2016-09-09 10:13:18 +0200 |
| commit | febca10492e68c10a18f48860577bf21748bc7cd (patch) | |
| tree | e46ea4f92ae2d8b5408a4f6acbca8660dce29f5d /config/initializers | |
| parent | a1f01c4eb5b3f8cc587775fedc825bbfb2f100d9 (diff) | |
| parent | 4425686bdf93f9d90187244b2f336043934cc75e (diff) | |
| download | chouette-core-febca10492e68c10a18f48860577bf21748bc7cd.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 2 | ||||
| -rw-r--r-- | config/initializers/reflex.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 734e96c33..057d4b215 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -303,7 +303,7 @@ Devise.setup do |config| # By default, devise_cas_authenticatable will create users. If you would rather # require user records to already exist locally before they can authenticate via # CAS, uncomment the following line. - config.cas_create_user = false + # config.cas_create_user = false # You can enable Single Sign Out, which by default is disabled. # config.cas_enable_single_sign_out = true diff --git a/config/initializers/reflex.rb b/config/initializers/reflex.rb new file mode 100644 index 000000000..ab3f9cfb8 --- /dev/null +++ b/config/initializers/reflex.rb @@ -0,0 +1,3 @@ +if Rails.application.config.try(:reflex_api_url) + Reflex::API.base_url = Rails.application.config.reflex_api_url +end |