aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/vendor/tzinfo.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/vendor/tzinfo.rb')
-rw-r--r--activesupport/lib/active_support/vendor/tzinfo.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/vendor/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo.rb
index 01fba6d632..cc4f086edf 100644
--- a/activesupport/lib/active_support/vendor/tzinfo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo.rb
@@ -1,6 +1,7 @@
begin
- require 'tzinfo'
-rescue LoadError
- $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'tzinfo-0.3.13', 'lib'))
- retry
+ gem 'tzinfo', '~> 0.3.13'
+rescue Gem::LoadError
+ $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/tzinfo-0.3.13/lib")
end
+
+require 'tzinfo'