Update Formtastic, do other stuff

fairmondo · Dec 27, 2016 · f75a870 · f75a870
1 parent a61d9a8
commit f75a870
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -61,7 +61,7 @@ gem 'handlebars_assets'
 
 ## Forms
 
-gem 'formtastic', '~> 2.3.0.rc3'
+gem 'formtastic', '~> 2.3.1'
 gem 'recaptcha', require: 'recaptcha/rails' # Captcha Gem
 
 # ---------- Controller ----------

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -762,7 +762,7 @@ DEPENDENCIES
   fastbill-automatic!
   ffaker
   font-awesome-rails (>= 4.2.0.0)
-  formtastic (~> 2.3.0.rc3)
+  formtastic (~> 2.3.1)
   friendly_id (>= 4.0.9)
   guard
   guard-ctags-bundler

diff --git a/config/application.rb b/config/application.rb
@@ -63,6 +63,8 @@ class Application < Rails::Application
                                       :address_observer,
                                       :payment_observer]
 
+    config.active_record.raise_in_transactional_callbacks = true
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Berlin'