diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/deploy_freeze | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/deploy_freeze')
-rw-r--r-- | app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue index afc1c2cda8e..d05a0761ae3 100644 --- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue +++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue @@ -1,10 +1,10 @@ <script> import { GlFormGroup, GlFormInput, GlModal, GlSprintf, GlLink } from '@gitlab/ui'; -import { mapActions, mapState } from 'vuex'; import { isValidCron } from 'cron-validator'; -import { mapComputed } from '~/vuex_shared/bindings'; +import { mapActions, mapState } from 'vuex'; import { __ } from '~/locale'; import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; +import { mapComputed } from '~/vuex_shared/bindings'; export default { components: { diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue index fc2ed10f3ca..0f898f20033 100644 --- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue +++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue @@ -1,6 +1,6 @@ <script> -import DeployFreezeTable from './deploy_freeze_table.vue'; import DeployFreezeModal from './deploy_freeze_modal.vue'; +import DeployFreezeTable from './deploy_freeze_table.vue'; export default { components: { |