Permalink
Browse files

Add test for Trac922. New patch for Rails 3.1.

  • Loading branch information...
pbm committed Jun 17, 2011
1 parent 4b59364 commit b0bec6eabb677ef5d0f34f69ac4e7ec994e62169
Showing with 13 additions and 1 deletion.
  1. +2 −0 Changes
  2. +2 −1 examples/rails/Rakefile
  3. +8 −0 examples/rails/patches/activesupport_time_patch-3.1.diff
  4. +1 −0 src/test/vmunit.conf
View
@@ -4,6 +4,8 @@
== Unreleased Changes
+* Add Rails 3.1.0rc4 support.
+* Fix Trac 922.
* Merge Fix of Trac 921.
* More fixes for Trac 913 . Fix some problems in printf.
* Fix a problem in rebuild of Hash.
View
@@ -39,7 +39,8 @@ namespace :patch do
"activesupport-3.0.4" => ['activesupport_class_patch.diff',
'activesupport_time_zone_patch.diff',
'activesupport_descendents_tracker_patch.diff'],
- "activesupport-3.1.0.rc4" => ['activesupport_class_patch-3.1.diff']
+ "activesupport-3.1.0.rc4" => ['activesupport_class_patch-3.1.diff',
+ 'activesupport_time_patch-3.1.diff']
}
apply_patches(patch_info)
end
@@ -0,0 +1,8 @@
+--- a/lib/active_support/core_ext/time/zones.rb
++++ b/lib/active_support/core_ext/time/zones.rb
+@@ -1,4 +1,5 @@
+ require 'active_support/time_with_zone'
++require 'tzinfo' # MagLev patch
+
+ class Time
+ class << self
View
@@ -395,6 +395,7 @@ Trac916.rb
Trac917.rb
Trac919.rb
Trac920.rb
+Trac922.rb
testMarshal.rb # after other coverage of Hash
#
# PopularApplications loads webrick, etc

0 comments on commit b0bec6e

Please sign in to comment.