diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 03:14:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 03:14:07 +0300 |
commit | ec6dd14345a117d1ff4db3b0b19a1c0fa4c7e61b (patch) | |
tree | 17fc96a7b90cf9cd5f1ad6eeff335234ebaf8a97 /app/helpers/time_zone_helper.rb | |
parent | 36c5bf80d4aaedba332a420e3d620b2ee9e2bb65 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/time_zone_helper.rb')
-rw-r--r-- | app/helpers/time_zone_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb index db355f5ff65..bc054269e0f 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 |