From d2e8a4e957076998fc4971f88b829fc8aae10aaa Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Mon, 9 Jan 2017 23:03:13 -0800
Subject: [PATCH] Allow Groupdate.time_zone to be set to false [skip ci]

---
 lib/groupdate/magic.rb | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

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