diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/javascripts/deploy_freeze/store/mutations.js | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
download | gitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/deploy_freeze/store/mutations.js')
-rw-r--r-- | app/assets/javascripts/deploy_freeze/store/mutations.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/deploy_freeze/store/mutations.js b/app/assets/javascripts/deploy_freeze/store/mutations.js index 151f7f39f5a..edb455a8dd5 100644 --- a/app/assets/javascripts/deploy_freeze/store/mutations.js +++ b/app/assets/javascripts/deploy_freeze/store/mutations.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { secondsToHours } from '~/lib/utils/datetime_utility'; +import { formatTimezone } from '~/lib/utils/datetime_utility'; import * as types from './mutation_types'; const formatTimezoneName = (freezePeriod, timezoneList) => { @@ -8,7 +8,7 @@ const formatTimezoneName = (freezePeriod, timezoneList) => { return convertObjectPropsToCamelCase({ ...freezePeriod, cron_timezone: { - formattedTimezone: tz && `[UTC ${secondsToHours(tz.offset)}] ${tz.name}`, + formattedTimezone: tz && formatTimezone(tz), identifier: freezePeriod.cron_timezone, }, }); |