diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/helpers/time_zone_helper.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/helpers/time_zone_helper.rb')
| -rw-r--r-- | app/helpers/time_zone_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/time_zone_helper.rb b/app/helpers/time_zone_helper.rb index fe045182c96..f92e32ff9b6 100644 --- a/app/helpers/time_zone_helper.rb +++ b/app/helpers/time_zone_helper.rb @@ -31,4 +31,9 @@ module TimeZoneHelper }.slice(*attrs) end end + + def local_time(timezone) + time_zone_instance = ActiveSupport::TimeZone.new(timezone) || Time.zone + time_zone_instance.now.strftime("%-l:%M %p") + end end |