diff options
| -rw-r--r-- | config/deploy/staging.rb | 2 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index c4f1dec2c..d0a1edc42 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,2 +1,2 @@ server "stif-boiv-staging.af83.priv", :app, :web, :db, :primary => true -set :branch, 'master' +set :branch, 'staging' diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 136f50c92..057d4b215 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -279,6 +279,7 @@ Devise.setup do |config| if Rails.application.config.chouette_authentication_settings[:type] == "cas" config.cas_base_url = Rails.application.config.chouette_authentication_settings[:cas_server] + config.cas_validate_url = Rails.application.config.chouette_authentication_settings[:cas_validate_url] end # you can override these if you need to, but cas_base_url is usually enough |