aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/form_options_helper_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-13 22:55:46 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-13 22:55:46 -0500
commitb2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch)
tree05ae73741366a390fd543b67f7080325c8d7525e /actionpack/test/template/form_options_helper_test.rb
parent6f9e449830902319d3c0897e67d8ac9c89bff39d (diff)
downloadrails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz
rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2
rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'actionpack/test/template/form_options_helper_test.rb')
-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 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