diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2015-04-19 20:40:06 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-04-19 20:40:06 +0900 |
| commit | f99a3eb1d9f54c82397bc868162bcbe7bf598b3a (patch) | |
| tree | f14f927de423a09df9249f22a046421d2fef0a4e /config/application.rb | |
| parent | f37f0c563ddd36c1627e9e42ceab902b364099a4 (diff) | |
| download | aclog-f99a3eb1d9f54c82397bc868162bcbe7bf598b3a.tar.gz | |
sync settings with the output of `rails new` in Rails 4.2.1
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index fd8b6e8..388e12d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,13 +1,14 @@ require File.expand_path('../boot', __FILE__) # Pick the frameworks you want: +require "active_model/railtie" +# require "active_job/railtie" require "active_record/railtie" require "action_controller/railtie" +# require "action_mailer/railtie" require "action_view/railtie" -require "action_mailer/railtie" -# require "active_job/railtie" -# require "rails/test_unit/railtie" require "sprockets/railtie" +# require "rails/test_unit/railtie" # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. @@ -35,6 +36,9 @@ module Aclog config.i18n.default_locale = :ja config.i18n.fallbacks = true + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + config.generators do |g| g.test_framework :rspec g.fixture_replacement :factory_girl |