diff --git a/Gemfile b/Gemfile index 0e3a73e82ac..2fdcec062c4 100644 --- a/Gemfile +++ b/Gemfile @@ -10,8 +10,6 @@ gem 'rake', '>= 10.3' # ensure correct loading order gem 'mocha', '~> 0.14', require: false -gem 'rails-html-sanitizer', '~> 1.0.2', github: 'rails/rails-html-sanitizer' - gem 'rack-cache', '~> 1.2' gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master' gem 'coffee-rails', '~> 4.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index c879cd15b91..7c42779a7d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,13 +35,6 @@ 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: @@ -172,6 +165,8 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) rake (10.4.2) rdoc (4.2.0) redcarpet (3.2.2) @@ -279,7 +274,6 @@ DEPENDENCIES racc (>= 1.4.6) rack-cache (~> 1.2) rails! - rails-html-sanitizer (~> 1.0.2)! rake (>= 10.3) redcarpet (~> 3.2.2) resque