Commit c77ea56d authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'nfriend-rearrange-release-components' into 'master'

Rearrange the Vue release components

See merge request gitlab-org/gitlab!18131
parents e3421799 42334d47
import $ from 'jquery';
import initForm from '~/pages/projects/init_form';
document.addEventListener('DOMContentLoaded', () => initForm($('.release-form')));
import initReleases from '~/releases'; import initReleases from '~/releases/list';
document.addEventListener('DOMContentLoaded', initReleases); document.addEventListener('DOMContentLoaded', initReleases);
...@@ -5,7 +5,7 @@ import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui'; ...@@ -5,7 +5,7 @@ import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import { __, n__, sprintf } from '../../locale'; import { __, n__, sprintf } from '~/locale';
import { slugify } from '~/lib/utils/text_utility'; import { slugify } from '~/lib/utils/text_utility';
import { getLocationHash } from '~/lib/utils/url_utility'; import { getLocationHash } from '~/lib/utils/url_utility';
import { scrollToElement } from '~/lib/utils/common_utils'; import { scrollToElement } from '~/lib/utils/common_utils';
......
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import ReleaseBlock from '~/releases/components/release_block.vue'; import ReleaseBlock from '~/releases/list/components/release_block.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import { first } from 'underscore'; import { first } from 'underscore';
import { release } from '../mock_data'; import { release } from '../mock_data';
......
import Vue from 'vue'; import Vue from 'vue';
import app from '~/releases/components/app.vue'; import app from '~/releases/list/components/app.vue';
import createStore from '~/releases/store'; import createStore from '~/releases/list/store';
import api from '~/api'; import api from '~/api';
import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { resetStore } from '../store/helpers'; import { resetStore } from '../store/helpers';
......
...@@ -3,9 +3,9 @@ import { ...@@ -3,9 +3,9 @@ import {
fetchReleases, fetchReleases,
receiveReleasesSuccess, receiveReleasesSuccess,
receiveReleasesError, receiveReleasesError,
} from '~/releases/store/actions'; } from '~/releases/list/store/actions';
import state from '~/releases/store/state'; import state from '~/releases/list/store/state';
import * as types from '~/releases/store/mutation_types'; import * as types from '~/releases/list/store/mutation_types';
import api from '~/api'; import api from '~/api';
import testAction from 'spec/helpers/vuex_action_helper'; import testAction from 'spec/helpers/vuex_action_helper';
import { releases } from '../mock_data'; import { releases } from '../mock_data';
......
import state from '~/releases/store/state'; import state from '~/releases/list/store/state';
// eslint-disable-next-line import/prefer-default-export // eslint-disable-next-line import/prefer-default-export
export const resetStore = store => { export const resetStore = store => {
......
import state from '~/releases/store/state'; import state from '~/releases/list/store/state';
import mutations from '~/releases/store/mutations'; import mutations from '~/releases/list/store/mutations';
import * as types from '~/releases/store/mutation_types'; import * as types from '~/releases/list/store/mutation_types';
import { releases } from '../mock_data'; import { releases } from '../mock_data';
describe('Releases Store Mutations', () => { describe('Releases Store Mutations', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment