Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Since escape_html_entities_in_json was moved to 3-2-stable, make it t…

…rue in AS, closes #6287
  • Loading branch information...
commit c13a3f0fc18eec15441e6d88073b92850e93d59a 1 parent 1839ecd
@josevalim josevalim authored
View
2  activesupport/lib/active_support/json/encoding.rb
@@ -136,7 +136,7 @@ def escape(string)
end
self.use_standard_json_time_format = true
- self.escape_html_entities_in_json = false
+ self.escape_html_entities_in_json = true
self.encode_big_decimal_as_string = true
end
end
View
3  railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -44,9 +44,6 @@ class Application < Rails::Application
# 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.
Please sign in to comment.
Something went wrong with that request. Please try again.