aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-09-24 18:36:40 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-09-24 18:38:18 -0700
commit0bd6e933c01868db7c7e20d46c972c4e7395b743 (patch)
treed91dbf5aaf990748082e42eb772ba049844794a3 /actionpack/test/template
parent772a32a22d71f7a22108719d88c94959ae4942b6 (diff)
downloadrails-0bd6e933c01868db7c7e20d46c972c4e7395b743.tar.gz
rails-0bd6e933c01868db7c7e20d46c972c4e7395b743.tar.bz2
rails-0bd6e933c01868db7c7e20d46c972c4e7395b743.zip
Restore split between require-time and runtime load path mungery. Simplifies vendor requires.
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/form_options_helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index f3cdab05bf..aa40e46aa8 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'active_support/vendor/tzinfo'
+require 'tzinfo'
TZInfo::Timezone.cattr_reader :loaded_zones