diff options
| author | Joshua French <jfrench@osake-2.local> | 2008-05-21 15:39:34 -0500 |
|---|---|---|
| committer | Joshua French <jfrench@osake-2.local> | 2008-05-21 15:39:34 -0500 |
| commit | 981bb9bcccf744bd1515b716865b645dd5110948 (patch) | |
| tree | a5358feb3b928dea279f74612855cf09e27fb01a /railties/configs | |
| parent | 066b56149c56b2ea0ebec4c92c9d825edbfb6607 (diff) | |
| parent | 49738f000b9c7e2902cf17e5e13943e5015f91b8 (diff) | |
| download | rails-981bb9bcccf744bd1515b716865b645dd5110948.tar.gz rails-981bb9bcccf744bd1515b716865b645dd5110948.tar.bz2 rails-981bb9bcccf744bd1515b716865b645dd5110948.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/configs')
| -rw-r--r-- | railties/configs/initializers/new_rails_defaults.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb index 1a718608ae..2d7889ef22 100644 --- a/railties/configs/initializers/new_rails_defaults.rb +++ b/railties/configs/initializers/new_rails_defaults.rb @@ -4,15 +4,15 @@ # Only save the attributes that have changed since the record was loaded. ActiveRecord::Base.partial_updates = true -# Include ActiveRecord class name as root for JSON serialized output. +# 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 +# Store the full class name (including module namespace) in STI type column. ActiveRecord::Base.store_full_sti_class = true -# Use ISO 8601 format for JSON serialized times and dates +# 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 +# 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 |