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/releases | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
15 files changed, 26 insertions, 26 deletions
diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue index 6e159939103..b16bb76c305 100644 --- a/app/assets/javascripts/releases/components/app_edit_new.vue +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -1,11 +1,11 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlButton, GlFormInput, GlFormGroup, GlSprintf } from '@gitlab/ui'; -import { __ } from '~/locale'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; -import { BACK_URL_PARAM } from '~/releases/constants'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; +import { BACK_URL_PARAM } from '~/releases/constants'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import AssetLinksForm from './asset_links_form.vue'; import TagField from './tag_field.vue'; diff --git a/app/assets/javascripts/releases/components/app_index.vue b/app/assets/javascripts/releases/components/app_index.vue index 5064b7dd6ad..32183e454c8 100644 --- a/app/assets/javascripts/releases/components/app_index.vue +++ b/app/assets/javascripts/releases/components/app_index.vue @@ -1,11 +1,11 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlEmptyState, GlLink, GlButton } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { getParameterByName } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; import ReleaseBlock from './release_block.vue'; -import ReleasesPagination from './releases_pagination.vue'; import ReleaseSkeletonLoader from './release_skeleton_loader.vue'; +import ReleasesPagination from './releases_pagination.vue'; import ReleasesSort from './releases_sort.vue'; export default { diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue index b6595ea78be..9e095c8a9c2 100644 --- a/app/assets/javascripts/releases/components/asset_links_form.vue +++ b/app/assets/javascripts/releases/components/asset_links_form.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlSprintf, GlLink, @@ -10,6 +9,7 @@ import { GlFormInput, GlFormSelect, } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { s__ } from '~/locale'; import { DEFAULT_ASSET_LINK_TYPE, ASSET_LINK_TYPE } from '../constants'; diff --git a/app/assets/javascripts/releases/components/evidence_block.vue b/app/assets/javascripts/releases/components/evidence_block.vue index 6e6017637d4..78831ceefe9 100644 --- a/app/assets/javascripts/releases/components/evidence_block.vue +++ b/app/assets/javascripts/releases/components/evidence_block.vue @@ -1,9 +1,9 @@ <script> -import dateFormat from 'dateformat'; import { GlLink, GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; -import { truncateSha } from '~/lib/utils/text_utility'; +import dateFormat from 'dateformat'; import { getTimeago } from '~/lib/utils/datetime_utility'; +import { truncateSha } from '~/lib/utils/text_utility'; +import { __, sprintf } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ExpandButton from '~/vue_shared/components/expand_button.vue'; diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index b89e5f2df3f..68bca2fc6b9 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/no-v-html */ -import { isEmpty } from 'lodash'; import $ from 'jquery'; +import { isEmpty } from 'lodash'; +import { scrollToElement } from '~/lib/utils/common_utils'; import { slugify } from '~/lib/utils/text_utility'; import { getLocationHash } from '~/lib/utils/url_utility'; -import { scrollToElement } from '~/lib/utils/common_utils'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import '~/behaviors/markdown/render_gfm'; import EvidenceBlock from './evidence_block.vue'; diff --git a/app/assets/javascripts/releases/components/release_block_footer.vue b/app/assets/javascripts/releases/components/release_block_footer.vue index 3beec466c54..cb795b3cba7 100644 --- a/app/assets/javascripts/releases/components/release_block_footer.vue +++ b/app/assets/javascripts/releases/components/release_block_footer.vue @@ -1,8 +1,8 @@ <script> import { GlTooltipDirective, GlLink, GlIcon } from '@gitlab/ui'; +import { __, sprintf } from '~/locale'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { __, sprintf } from '~/locale'; export default { name: 'ReleaseBlockFooter', diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue index 87538244f1a..65b68c93e35 100644 --- a/app/assets/javascripts/releases/components/release_block_header.vue +++ b/app/assets/javascripts/releases/components/release_block_header.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective, GlLink, GlBadge, GlButton } from '@gitlab/ui'; -import { BACK_URL_PARAM } from '~/releases/constants'; import { setUrlParams } from '~/lib/utils/url_utility'; +import { BACK_URL_PARAM } from '~/releases/constants'; export default { name: 'ReleaseBlockHeader', diff --git a/app/assets/javascripts/releases/components/releases_pagination_graphql.vue b/app/assets/javascripts/releases/components/releases_pagination_graphql.vue index cb6f1fa18a1..7d024c47fb9 100644 --- a/app/assets/javascripts/releases/components/releases_pagination_graphql.vue +++ b/app/assets/javascripts/releases/components/releases_pagination_graphql.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlKeysetPagination } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; export default { diff --git a/app/assets/javascripts/releases/components/releases_pagination_rest.vue b/app/assets/javascripts/releases/components/releases_pagination_rest.vue index 334458a2302..24abb0f4498 100644 --- a/app/assets/javascripts/releases/components/releases_pagination_rest.vue +++ b/app/assets/javascripts/releases/components/releases_pagination_rest.vue @@ -1,7 +1,7 @@ <script> import { mapActions, mapState } from 'vuex'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; export default { name: 'ReleasesPaginationRest', diff --git a/app/assets/javascripts/releases/components/tag_field_existing.vue b/app/assets/javascripts/releases/components/tag_field_existing.vue index 046885fe2f6..3345bbecf6e 100644 --- a/app/assets/javascripts/releases/components/tag_field_existing.vue +++ b/app/assets/javascripts/releases/components/tag_field_existing.vue @@ -1,7 +1,7 @@ <script> -import { mapState } from 'vuex'; -import { uniqueId } from 'lodash'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; +import { mapState } from 'vuex'; import FormFieldContainer from './form_field_container.vue'; export default { diff --git a/app/assets/javascripts/releases/components/tag_field_new.vue b/app/assets/javascripts/releases/components/tag_field_new.vue index 4779feae886..660fd7ac950 100644 --- a/app/assets/javascripts/releases/components/tag_field_new.vue +++ b/app/assets/javascripts/releases/components/tag_field_new.vue @@ -1,7 +1,7 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; import { uniqueId } from 'lodash'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { __ } from '~/locale'; import RefSelector from '~/ref/components/ref_selector.vue'; import FormFieldContainer from './form_field_container.vue'; diff --git a/app/assets/javascripts/releases/stores/modules/detail/actions.js b/app/assets/javascripts/releases/stores/modules/detail/actions.js index 54b08ac0dbc..5fa002706c6 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/actions.js +++ b/app/assets/javascripts/releases/stores/modules/detail/actions.js @@ -1,14 +1,14 @@ import api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; +import oneReleaseQuery from '~/releases/queries/one_release.query.graphql'; import { releaseToApiJson, apiJsonToRelease, gqClient, convertOneReleaseGraphQLResponse, } from '~/releases/util'; -import oneReleaseQuery from '~/releases/queries/one_release.query.graphql'; import * as types from './mutation_types'; export const initializeRelease = ({ commit, dispatch, getters }) => { diff --git a/app/assets/javascripts/releases/stores/modules/list/actions.js b/app/assets/javascripts/releases/stores/modules/list/actions.js index 9d56323b3c7..f1add54626a 100644 --- a/app/assets/javascripts/releases/stores/modules/list/actions.js +++ b/app/assets/javascripts/releases/stores/modules/list/actions.js @@ -1,14 +1,14 @@ -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { __ } from '~/locale'; import api from '~/api'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { normalizeHeaders, parseIntPagination, convertObjectPropsToCamelCase, } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; -import { gqClient, convertAllReleasesGraphQLResponse } from '../../../util'; import { PAGE_SIZE } from '../../../constants'; +import { gqClient, convertAllReleasesGraphQLResponse } from '../../../util'; import * as types from './mutation_types'; /** diff --git a/app/assets/javascripts/releases/stores/modules/list/index.js b/app/assets/javascripts/releases/stores/modules/list/index.js index 244f41b6609..d5ca191153a 100644 --- a/app/assets/javascripts/releases/stores/modules/list/index.js +++ b/app/assets/javascripts/releases/stores/modules/list/index.js @@ -1,6 +1,6 @@ -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default (initialState) => ({ namespaced: true, diff --git a/app/assets/javascripts/releases/util.js b/app/assets/javascripts/releases/util.js index b24a226cf9c..36c17b5b252 100644 --- a/app/assets/javascripts/releases/util.js +++ b/app/assets/javascripts/releases/util.js @@ -1,10 +1,10 @@ import { pick } from 'lodash'; import createGqClient, { fetchPolicies } from '~/lib/graphql'; -import { truncateSha } from '~/lib/utils/text_utility'; import { convertObjectPropsToCamelCase, convertObjectPropsToSnakeCase, } from '~/lib/utils/common_utils'; +import { truncateSha } from '~/lib/utils/text_utility'; /** * Converts a release object into a JSON object that can sent to the public |