diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-07 09:31:49 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-07 09:31:49 +0000 |
| commit | 8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1 (patch) | |
| tree | 79d533b4e80664d82fcb1df3c004a17a0ad2fb68 /actionpack | |
| parent | 6c434e8b8e420c76f86ba6605e98426fddca5031 (diff) | |
| download | rails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.tar.gz rails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.tar.bz2 rails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.zip | |
Fix conflict with assert_tag and Glue gem (closes #2255) [david.felstead@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/document.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3905686049..f884c8d404 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com] + * Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 [Jamis Buck] * Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson] diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb index 9949afb6c9..25230f2ee4 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb @@ -1,5 +1,5 @@ -require 'html/tokenizer' -require 'html/node' +require File.dirname(__FILE__) + '/tokenizer' +require File.dirname(__FILE__) + '/node' module HTML #:nodoc: |