Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

remove require active_support/tzinfo as file dosent exists #TODO fix #1215

Merged
merged 1 commit into from

2 participants

@vatrai

remove require active_support/tzinfo as file dosent exists #TODO fix

@josevalim josevalim merged commit 4ee7d92 into rails:master
@jake3030 jake3030 referenced this pull request from a commit in jake3030/rails
@tomstuart tomstuart Add :only/:except options to map.resources
This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1215 state:committed]
44a3009
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 3 deletions.
  1. +1 −3 activesupport/lib/active_support/values/time_zone.rb
View
4 activesupport/lib/active_support/values/time_zone.rb
@@ -315,10 +315,8 @@ def period_for_local(time, dst=true)
tzinfo.period_for_local(time, dst)
end
- # TODO: Preload instead of lazy load for thread safety
def self.find_tzinfo(name)
- require 'active_support/tzinfo' unless defined?(::TZInfo)
- ::TZInfo::TimezoneProxy.new(MAPPING[name] || name)
+ TZInfo::TimezoneProxy.new(MAPPING[name] || name)
end
class << self
Something went wrong with that request. Please try again.