aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-10 16:52:00 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-10 16:52:00 -0300
commit3229eda00c2a38526787fddb6cc307cfee5c5ac6 (patch)
tree9b45bf0c52e5b20ab403a5ac0025b9b1b18a5ce3 /Gemfile
parent6e76031e8f1f815b390f966cb21e25c66e5ded50 (diff)
parentff1b7e75357eb7797f25aeab33994765130db67f (diff)
downloadrails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.gz
rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.bz2
rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.zip
Merge pull request #11218 from kaspth/loofah-integration
Loofah-integration Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 60c4b31e5b..29ccd10e6d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,9 @@ source 'https://rubygems.org'
gemspec
+#temporary gem until a new version of loofah is released
+gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub'
+
# This needs to be with require false as it is
# loaded after loading the test library to
# ensure correct loading order
@@ -13,6 +16,8 @@ gem 'jquery-rails', '~> 3.1.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
gem 'arel', github: 'rails/arel', branch: 'master'
+gem 'rails-dom-testing', github: 'rails/rails-dom-testing'
+gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer'
gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'