diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/helpers/time_zone_helper.rb | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/helpers/time_zone_helper.rb')
| -rw-r--r-- | app/helpers/time_zone_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |