aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/string/output_safety.rb
diff options
context:
space:
mode:
authorHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
committerHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
commitfa6d921e11363e9b8c4bc10f7aed0b9faffdc33a (patch)
tree1e4fd51d0d58cb5b5f210eeb6842ca3ada999243 /activesupport/lib/active_support/core_ext/string/output_safety.rb
parent7eb09aed874dbb5f50a9ac0d0dec22e42f6161be (diff)
downloadrails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.gz
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.bz2
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.zip
Remove blank trailing comments
For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilĂ ! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string/output_safety.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 5226ff0cbe..d4e1597840 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -64,7 +64,6 @@ class ERB
# in Rails templates:
#
# <%=j @person.to_json %>
- #
def json_escape(s)
result = s.to_s.gsub(JSON_ESCAPE_REGEXP) { |special| JSON_ESCAPE[special] }
s.html_safe? ? result.html_safe : result