diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-24 11:11:08 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-24 11:11:08 +0100 |
| commit | f3f67ce6212e2ae35470ab2960bb4967ae967ee2 (patch) | |
| tree | 6a3054b9e4882a3faea6acc8b935db16a0831c4e /actionpack/lib/action_controller/assertions/selector_assertions.rb | |
| parent | eea5dc3a34328267407f2cb861e14d9d1f5d7c02 (diff) | |
| parent | 2dd0ec48a5068a095e362fad2a77d63b86fdfd95 (diff) | |
| download | rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.tar.gz rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.tar.bz2 rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/assertions/selector_assertions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index bcbb570e4b..40ac572fdb 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -3,8 +3,7 @@ # Under MIT and/or CC By license. #++ -require 'rexml/document' -require 'html/document' +require 'action_controller/vendor/html-scanner' module ActionController module Assertions |