aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-14 08:02:45 +0200
committerJosé Valim <jose.valim@gmail.com>2012-05-14 08:02:45 +0200
commitc13a3f0fc18eec15441e6d88073b92850e93d59a (patch)
treece6cb32dbb94befc8f3065eeb597a8c428208731 /railties/lib/rails
parent1839ecd2288680dba8533610eb4c9dfe2ab6326e (diff)
downloadrails-c13a3f0fc18eec15441e6d88073b92850e93d59a.tar.gz
rails-c13a3f0fc18eec15441e6d88073b92850e93d59a.tar.bz2
rails-c13a3f0fc18eec15441e6d88073b92850e93d59a.zip
Since escape_html_entities_in_json was moved to 3-2-stable, make it true in AS, closes #6287
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 5fa96397f0..d816f973e6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -44,9 +44,6 @@ module <%= app_const_base %>
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
- # Enable escaping HTML in JSON. The default is false.
- # config.active_support.escape_html_entities_in_json = true
-
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types.