aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-08-25 01:11:22 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-08-28 11:19:36 +0200
commit3fb10fd4790841ab82c4f0697b5527b7d6a40c6c (patch)
treeb6b27e000eb85c48460e2dbbccec83d5c310ed31 /actionpack
parent67f55e282236eef53adc6036e735190b1dda5a47 (diff)
downloadrails-3fb10fd4790841ab82c4f0697b5527b7d6a40c6c.tar.gz
rails-3fb10fd4790841ab82c4f0697b5527b7d6a40c6c.tar.bz2
rails-3fb10fd4790841ab82c4f0697b5527b7d6a40c6c.zip
Add deprecation horizon to html-scanner
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner.rb b/actionpack/lib/action_controller/vendor/html-scanner.rb
index 35f4d1e7fa..896208bc05 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner.rb
@@ -1,4 +1,5 @@
require 'action_view/vendor/html-scanner'
require 'active_support/deprecation'
-ActiveSupport::Deprecation.warn 'vendored html-scanner was moved to action_view, please require "action_view/vendor/html-scanner" instead'
+ActiveSupport::Deprecation.warn 'Vendored html-scanner was moved to action_view, please require "action_view/vendor/html-scanner" instead. ' +
+ 'This file will be removed in Rails 4.1'