diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-12-01 03:02:03 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-12-01 03:02:03 -0800 |
| commit | 18b462b3f9c99b3fcfcb7b83affa931d9c4020bf (patch) | |
| tree | 419c17a51dc4a2b192e2fc6dbc732f5707d4dab4 /activesupport | |
| parent | 49ff20d9b164693ed7fee880b69cc14b141678b3 (diff) | |
| parent | 9fbf4518722d09b3d86d183d882cefc7f79d73d0 (diff) | |
| download | rails-18b462b3f9c99b3fcfcb7b83affa931d9c4020bf.tar.gz rails-18b462b3f9c99b3fcfcb7b83affa931d9c4020bf.tar.bz2 rails-18b462b3f9c99b3fcfcb7b83affa931d9c4020bf.zip | |
Merge pull request #13123 from chancancode/json_encoder_nodoc_fix
JSON encoder internals showed up in docs [ci skip]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 935dd88a03..eb25ef7a4c 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -48,7 +48,7 @@ module ActiveSupport ESCAPE_REGEX_WITHOUT_HTML_ENTITIES = /[\u2028\u2029]/u # This class wraps all the strings we see and does the extra escaping - class EscapedString < String + class EscapedString < String #:nodoc: def to_json(*) if Encoding.escape_html_entities_in_json super.gsub ESCAPE_REGEX_WITH_HTML_ENTITIES, ESCAPED_CHARS |