Permalink
Browse files

Merge pull request #2911 from toolmantim/patch-1

Make sure require_tzinfo only calls Kernel#require if TZInfo isn't alread
  • Loading branch information...
2 parents 2b354fe + 2147f35 commit fb5dbe8c75e43284af80b7fceb4300980a0be0de @jonleighton jonleighton committed Sep 7, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/values/time_zone.rb
@@ -371,7 +371,7 @@ def us_zones
protected
def require_tzinfo
- require 'tzinfo'
+ require 'tzinfo' unless defined?(::TZInfo)
rescue LoadError
$stderr.puts "You don't have tzinfo installed in your application. Please add it to your Gemfile and run bundle install"
raise

0 comments on commit fb5dbe8

Please sign in to comment.