Update config in a true Rails 4 way

5 files changed, 21 insertions, 10 deletions

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..d2f4ec33a
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 000000000..ac5f8b663
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c3f251477..8553853c4 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = ChouetteIhm::Application.config.mailer_sender
+  config.mailer_sender = Rails.application.config.mailer_sender
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 100171d40..5f618b7d5 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
@@ -11,3 +12,7 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'réseau', 'réseaux'
 end
 
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index a5cc92f42..67a518005 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-ChouetteIhm::Application.config.session_store :cookie_store, :key => '_chouette_ihm_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# ChouetteIhm::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_chouette_ihm_session'