kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix conflict with assert_tag and Glue gem (closes #2255) [david.felstead@gmail.com]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-11-07 09:31:49 +00:00
parent 6c434e8b8e
commit 8dda7c5449
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG
View file

@ -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]

4
actionpack/lib/action_controller/vendor/html-scanner/html/document.rb vendored
View file

@ -1,5 +1,5 @@
require 'html/tokenizer'
require 'html/node'
require File.dirname(__FILE__) + '/tokenizer'
require File.dirname(__FILE__) + '/node'
module HTML #:nodoc: