Deprecation Warnings removed; Seeds corrected, Refs: #2070

5 files changed, 10 insertions, 3 deletions

diff --git a/config/application.rb b/config/application.rb
index 70b927855..06f931765 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,6 +31,7 @@ module ChouetteIhm
     config.browserify_rails.commandline_options = "-t [ babelify --presets [ react es2015 ] ]"
 
     config.active_record.observers = :route_observer
+    config.active_record.raise_in_transactional_callbacks = true
 
     unless Rails.env.production?
         # Work around sprockets+teaspoon mismatch:
diff --git a/config/environment.rb b/config/environment.rb
index 592eda45a..4d27bfaec 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__)
 Rails.application.initialize!
 
 # Fix version
-APP_VERSION = 'Itération 7'
+APP_VERSION = 'Itération 9'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 71fe99fe8..41b31b1e8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -19,7 +19,7 @@ Rails.application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b77a26273..d83b4fd85 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -15,7 +15,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
index 2cdc37243..e2341f037 100644
--- a/config/initializers/formtastic.rb
+++ b/config/initializers/formtastic.rb
@@ -74,3 +74,9 @@ Formtastic::FormBuilder.default_text_area_width = 50
 # this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
 # See http://diveintohtml5.org/forms.html#validation for more info.
 # Formtastic::FormBuilder.perform_browser_validations = true
+
+
+# ------------------------------------------------------------------------------------
+# Preparing Formtastic 4.0
+Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+Formtastic::FormBuilder.input_class_finder  = Formtastic::InputClassFinder