diff --git a/Gemfile b/Gemfile index fc1334e..a3841ac 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '4.2.0' # additional gems for rails 4 -gem 'railties', '= 4.2.0' +gem 'railties'#, '= 4.2.0' gem 'responders', '~> 2.0' # allows use of respond_with and respond_to in controllers # add these gems to help with the transition: @@ -43,12 +43,12 @@ group :development, :test do gem "byebug" - gem 'web-console', '~>2.0' end group :development do gem "better_errors" gem "binding_of_caller" + gem 'web-console', '~>2.0' end # diff --git a/config/application.rb b/config/application.rb index 651aaff..981aef6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -89,5 +89,6 @@ # in the next version. Devise appears to be using those callbacks. # To accept the new behaviour use 'true' otherwise use 'false' config.active_record.raise_in_transactional_callbacks = true + end end