From 0bfb62457ba5122c9bf30bed3ecd20759a9a16bd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 Aug 2020 06:10:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/time_zone.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config') diff --git a/config/initializers/time_zone.rb b/config/initializers/time_zone.rb index ee246e67d66..bca7411ad63 100644 --- a/config/initializers/time_zone.rb +++ b/config/initializers/time_zone.rb @@ -1 +1,8 @@ Time.zone = Gitlab.config.gitlab.time_zone || Time.zone +# The default is normally set by Rails in the +# active_support.initialize_time_zone Railtie, but we need to set it +# here because the config settings aren't available until after that +# runs. We set the default to ensure multi-threaded servers have the +# right value. +Time.zone_default = Time.zone +Rails.application.config.time_zone = Time.zone -- cgit v1.2.1