weekly pull for edge rails · kfl62/trst_sys@2356629

Commit

weekly pull for edge rails

Browse files

kfl62 committed Apr 3, 2009

1 parent 0484aee commit 2356629

+1 −0		actionpack/test/fixtures/test/backup_files/item.html.erb
+1 −0		actionpack/test/fixtures/test/backup_files/item.html.erb.orig
+6 −0		actionpack/test/template/render_test.rb
+2 −0		actionpack/test/template/template_test.rb
+5 −0		activesupport/CHANGELOG
+5 −0		activesupport/lib/active_support/cache/strategy/local_cache.rb
+3 −11		activesupport/lib/active_support/core_ext/time/calculations.rb
+12 −0		activesupport/test/core_ext/duration_test.rb
+57 −16		activesupport/test/core_ext/time_ext_test.rb
+10 −1		railties/builtin/rails_info/rails/info.rb
+6 −1		railties/html/index.html