Permalink
Browse files

Fix conflict with assert_tag and Glue gem (closes #2255) [david.felst…

…ead@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Nov 7, 2005
1 parent 6c434e8 commit 8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1
Showing with 4 additions and 2 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −2 actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
View
@@ -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]
@@ -1,5 +1,5 @@
-require 'html/tokenizer'
-require 'html/node'
+require File.dirname(__FILE__) + '/tokenizer'
+require File.dirname(__FILE__) + '/node'
module HTML #:nodoc:

0 comments on commit 8dda7c5

Please sign in to comment.