diff options
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 15c5766395..e567df7162 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -10,17 +10,7 @@ module Rails initializer :load_environment_hook, :group => :all do end initializer :load_active_support, :group => :all do - unless config.active_support.bare - require "active_support/all" - - # Assign config options of JSON encoding - [:escape_html_entities_in_json, :use_standard_json_time_format, :encode_big_decimal_as_string].each do |option| - value = config.active_support.send(option) - if !value.nil? - ActiveSupport::JSON::Encoding.send("#{option}=", value) - end - end - end + require "active_support/all" unless config.active_support.bare end # Preload all frameworks specified by the Configuration#frameworks. |