diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/deploy_freeze | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/deploy_freeze')
3 files changed, 4 insertions, 4 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: { diff --git a/app/assets/javascripts/deploy_freeze/store/actions.js b/app/assets/javascripts/deploy_freeze/store/actions.js index 9a75c3cad2f..62045d2517d 100644 --- a/app/assets/javascripts/deploy_freeze/store/actions.js +++ b/app/assets/javascripts/deploy_freeze/store/actions.js @@ -1,7 +1,7 @@ -import * as types from './mutation_types'; import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __ } from '~/locale'; +import * as types from './mutation_types'; export const requestAddFreezePeriod = ({ commit }) => { commit(types.REQUEST_ADD_FREEZE_PERIOD); |