diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-12 12:54:28 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-12 12:54:28 -0300 |
| commit | 45f6dcd90393a0655e8febb40d138b969c2f38db (patch) | |
| tree | 3c6d81ba1b235c8ab8c7aeb27b1bf6f375f6990b /railties/lib/rails | |
| parent | bae190c5a6bab464681da9e0f53471a5a7301f41 (diff) | |
| download | rails-45f6dcd90393a0655e8febb40d138b969c2f38db.tar.gz rails-45f6dcd90393a0655e8febb40d138b969c2f38db.tar.bz2 rails-45f6dcd90393a0655e8febb40d138b969c2f38db.zip | |
Move AS set configs to AS Raitie
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. |