diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-17 17:56:23 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-17 17:58:00 +0200 |
| commit | 10ba09f5466fe3d34a5ed78202c35f4e4f9d30e6 (patch) | |
| tree | ed1a2f603198053a6872d3ac74ee69ba4990fdf3 /config/application.rb | |
| parent | ff2cbc07530d87132af09900b4d0c9ada9d3e716 (diff) | |
Upgrade to Rails 5.0.0.1
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 7d6182ecc..c3ea5851a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,4 +1,4 @@ -require File.expand_path('../boot', __FILE__) +require_relative 'boot' require 'rails/all' @@ -22,9 +22,6 @@ module Mastodon # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - # Do not swallow errors in after_commit/after_rollback callbacks. - config.active_record.raise_in_transactional_callbacks = true - config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] |