Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb
index a0d9c8403e8..db355f5ff65 100644
--- a/app/helpers/time_zone_helper.rb
+++ b/app/helpers/time_zone_helper.rb
@@ -32,10 +32,16 @@ module TimeZoneHelper
     end
   end
 
+  def local_time_instance(timezone)
+    return Time.zone if timezone.blank?
+
+    ActiveSupport::TimeZone.new(timezone) || Time.zone
+  end
+
   def local_time(timezone)
     return if timezone.blank?
 
-    time_zone_instance = ActiveSupport::TimeZone.new(timezone) || Time.zone
+    time_zone_instance = local_time_instance(timezone)
     time_zone_instance.now.strftime("%-l:%M %p")
   end
 end