From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Dec 2021 13:37:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee --- app/helpers/time_zone_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/helpers/time_zone_helper.rb') diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb index db355f5ff65..d16f13304e5 100644 --- a/app/helpers/time_zone_helper.rb +++ b/app/helpers/time_zone_helper.rb @@ -3,6 +3,7 @@ module TimeZoneHelper TIME_ZONE_FORMAT_ATTRS = { short: %i[identifier name offset], + abbr: %i[identifier abbr], full: %i[identifier name abbr offset formatted_offset] }.freeze private_constant :TIME_ZONE_FORMAT_ATTRS @@ -32,7 +33,7 @@ module TimeZoneHelper end end - def local_time_instance(timezone) + def local_timezone_instance(timezone) return Time.zone if timezone.blank? ActiveSupport::TimeZone.new(timezone) || Time.zone @@ -41,7 +42,7 @@ module TimeZoneHelper def local_time(timezone) return if timezone.blank? - time_zone_instance = local_time_instance(timezone) + time_zone_instance = local_timezone_instance(timezone) time_zone_instance.now.strftime("%-l:%M %p") end end -- cgit v1.2.3