diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-03 19:20:43 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-03 19:20:43 -0800 |
commit | 6042067c0b20602e72954450e9e8a19dfa8a9f7d (patch) | |
tree | aff2dae32a7253c9cd61679f7b5d91797bd4be8e /railties/lib/rails/generators | |
parent | 532b11690fa2c4fd2c127ddc7df246c4469ebbc4 (diff) | |
download | rails-6042067c0b20602e72954450e9e8a19dfa8a9f7d.tar.gz rails-6042067c0b20602e72954450e9e8a19dfa8a9f7d.tar.bz2 rails-6042067c0b20602e72954450e9e8a19dfa8a9f7d.zip |
Changed the default ActiveSupport.use_standard_json_time_format from false to true and
ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH]
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb index 8ec3186c84..91a8fdb688 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb @@ -4,16 +4,6 @@ # for Rails 3. You can remove this initializer when Rails 3 is released. if defined?(ActiveRecord) - # Include Active Record class name as root for JSON serialized output. - ActiveRecord::Base.include_root_in_json = true - # Store the full class name (including module namespace) in STI type column. ActiveRecord::Base.store_full_sti_class = true -end - -# Use ISO 8601 format for JSON serialized times and dates. -ActiveSupport.use_standard_json_time_format = true - -# Don't escape HTML entities in JSON, leave that for the #json_escape helper. -# if you're including raw json in an HTML page. -ActiveSupport.escape_html_entities_in_json = false
\ No newline at end of file +end
\ No newline at end of file |