From b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 22:55:46 -0500 Subject: Rollback AS bundler work and improve activation of vendored dependencies --- actionpack/test/template/form_options_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/test/template') diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index aa40e46aa8..f3cdab05bf 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 'tzinfo' +require 'active_support/vendor/tzinfo' TZInfo::Timezone.cattr_reader :loaded_zones -- cgit v1.2.3