diff options
| author | Timm <kaspth@gmail.com> | 2013-09-09 18:45:13 +0200 |
|---|---|---|
| committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:12 +0200 |
| commit | 170f414928fcd3d3e691ee67ad59798b77b6330f (patch) | |
| tree | af3b7cf2be0e4dd3b000818bbc9497cbc3e07d80 | |
| parent | 229092ffee94f4be2e2fad59d8085501885b13b8 (diff) | |
| download | rails-170f414928fcd3d3e691ee67ad59798b77b6330f.tar.gz rails-170f414928fcd3d3e691ee67ad59798b77b6330f.tar.bz2 rails-170f414928fcd3d3e691ee67ad59798b77b6330f.zip | |
Removed require's for html-scanner.
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 1 | ||||
| -rw-r--r-- | actionview/lib/action_view/vendor/html-scanner.rb | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index eb9faa78a9..d541e577cf 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'action_view/vendor/html-scanner' require 'controller/fake_controllers' class ActionPackAssertionsController < ActionController::Base diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index e03580cc6d..f509426040 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'controller/fake_controllers' -require 'action_view/vendor/html-scanner' class SessionTest < ActiveSupport::TestCase StubApp = lambda { |env| diff --git a/actionview/lib/action_view/vendor/html-scanner.rb b/actionview/lib/action_view/vendor/html-scanner.rb index 775b827529..d26ce6012c 100644 --- a/actionview/lib/action_view/vendor/html-scanner.rb +++ b/actionview/lib/action_view/vendor/html-scanner.rb @@ -1,5 +1,8 @@ +require 'active_support/deprecation' $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/html-scanner" +ActiveSupport::Deprecation.warn("html-scanner has been deprecated in favor of using Loofah in SanitizeHelper and ActionView::Assertions.") + module HTML extend ActiveSupport::Autoload |