diff --git a/lib/groupdate/magic.rb b/lib/groupdate/magic.rb index 854c8fa..96bfdd8 100644 --- a/lib/groupdate/magic.rb +++ b/lib/groupdate/magic.rb @@ -195,6 +195,7 @@ module Groupdate def time_zone @time_zone ||= begin time_zone = "Etc/UTC" if options[:time_zone] == false + time_zone ||= "Etc/UTC" if Groupdate.time_zone == false time_zone ||= options[:time_zone] || Groupdate.time_zone || Time.zone || "Etc/UTC" time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone] end -- libgit2 0.21.0