Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · May 12, 2016 · 8c492f8 · 8c492f8
2 parents 254c55a + 6c68edc
commit 8c492f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem "rubyzip", '~> 0.9.9'
 gem "RedCloth", ">=4.0.0"
 gem "erubis"
 gem "nokogiri", '~>1.5.6'
-gem "rake"
+gem "rake", '~>10.4.0'
 gem "rdoc"
 gem "json"
 gem "abstract", "~> 1.0.0"

diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -19,7 +19,7 @@ def html_escape(s)
       if s.html_safe?
         s
       else
-        s.gsub(/[&"'><]/n) { |special| HTML_ESCAPE[special] }.html_safe
+        s.gsub(/[&"'><]/) { |special| HTML_ESCAPE[special] }.html_safe
       end
     end