aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-03-07 18:48:06 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-03-10 20:04:01 +0100
commit37695b8aabc1386f21039b16c32541d71f0d4182 (patch)
tree1b6b3ec5dabb35507527f6d7f94ca22b843d8480 /Gemfile.lock
parent96b8f401f58e9ed4ea41aa32a2b34850640ac0d7 (diff)
downloadrails-37695b8aabc1386f21039b16c32541d71f0d4182.tar.gz
rails-37695b8aabc1386f21039b16c32541d71f0d4182.tar.bz2
rails-37695b8aabc1386f21039b16c32541d71f0d4182.zip
Let strip_tags leave HTML escaping to Rails.
Prevents double escaping errors, such as "&amp;" becoming "&amp;amp;".
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0dc7559d9e..c879cd15b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,6 +35,13 @@ GIT
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
+GIT
+ remote: git://github.com/rails/rails-html-sanitizer.git
+ revision: 4f0f7810fce6c8aa63de07a40d69d6027a30acaf
+ specs:
+ rails-html-sanitizer (1.0.2)
+ loofah (~> 2.0)
+
PATH
remote: .
specs:
@@ -50,13 +57,13 @@ PATH
rack (~> 1.6)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
globalid (>= 0.3.0)
@@ -165,8 +172,6 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.1)
- loofah (~> 2.0)
rake (10.4.2)
rdoc (4.2.0)
redcarpet (3.2.2)
@@ -274,6 +279,7 @@ DEPENDENCIES
racc (>= 1.4.6)
rack-cache (~> 1.2)
rails!
+ rails-html-sanitizer (~> 1.0.2)!
rake (>= 10.3)
redcarpet (~> 3.2.2)
resque