aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-12 05:45:59 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-12 05:45:59 -0700
commit98355fe100d9e014e88ba9b1b78f606c9312bc44 (patch)
tree2bb8d79a83c7d5bbf20aed8d7389163f91b2bbfb /railties/lib/rails
parenteab0520e132e373618f6e3ce585ebd71ec501e97 (diff)
parent1d1939056a81dd809b623a17d9930cf0bd1ca8ca (diff)
downloadrails-98355fe100d9e014e88ba9b1b78f606c9312bc44.tar.gz
rails-98355fe100d9e014e88ba9b1b78f606c9312bc44.tar.bz2
rails-98355fe100d9e014e88ba9b1b78f606c9312bc44.zip
Merge pull request #6277 from homakov/patch-6
Comment for active_support's option in application.rb
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb3
1 files changed, 3 insertions, 0 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 c8a3c13b95..daa04c144e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -43,6 +43,9 @@ 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,