Commit 07ba9510 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'cngo-move-js-code-to-issues' into 'master'

Move code to ~/issues

See merge request gitlab-org/gitlab!76261
parents aecb25b5 dc354695
...@@ -8,8 +8,8 @@ import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue'; ...@@ -8,8 +8,8 @@ import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue';
import { parseIssuableData } from '~/issues/show/utils/parse_data'; import { parseIssuableData } from '~/issues/show/utils/parse_data';
import initNotesApp from '~/notes'; import initNotesApp from '~/notes';
import { store } from '~/notes/stores'; import { store } from '~/notes/stores';
import initRelatedMergeRequestsApp from '~/related_merge_requests'; import initRelatedMergeRequestsApp from '~/issues/related_merge_requests';
import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace'; import initSentryErrorStackTraceApp from '~/issues/sentry_error_stack_trace';
import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning'; import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning';
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
......
...@@ -2,8 +2,8 @@ import { mount, createLocalVue } from '@vue/test-utils'; ...@@ -2,8 +2,8 @@ import { mount, createLocalVue } from '@vue/test-utils';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import mockData from 'test_fixtures/issues/related_merge_requests.json'; import mockData from 'test_fixtures/issues/related_merge_requests.json';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import RelatedMergeRequests from '~/related_merge_requests/components/related_merge_requests.vue'; import RelatedMergeRequests from '~/issues/related_merge_requests/components/related_merge_requests.vue';
import createStore from '~/related_merge_requests/store/index'; import createStore from '~/issues/related_merge_requests/store/index';
import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue';
const API_ENDPOINT = '/api/v4/projects/2/issues/33/related_merge_requests'; const API_ENDPOINT = '/api/v4/projects/2/issues/33/related_merge_requests';
......
...@@ -2,8 +2,8 @@ import MockAdapter from 'axios-mock-adapter'; ...@@ -2,8 +2,8 @@ import MockAdapter from 'axios-mock-adapter';
import testAction from 'helpers/vuex_action_helper'; import testAction from 'helpers/vuex_action_helper';
import createFlash from '~/flash'; import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import * as actions from '~/related_merge_requests/store/actions'; import * as actions from '~/issues/related_merge_requests/store/actions';
import * as types from '~/related_merge_requests/store/mutation_types'; import * as types from '~/issues/related_merge_requests/store/mutation_types';
jest.mock('~/flash'); jest.mock('~/flash');
......
import * as types from '~/related_merge_requests/store/mutation_types'; import * as types from '~/issues/related_merge_requests/store/mutation_types';
import mutations from '~/related_merge_requests/store/mutations'; import mutations from '~/issues/related_merge_requests/store/mutations';
describe('RelatedMergeRequests Store Mutations', () => { describe('RelatedMergeRequests Store Mutations', () => {
describe('SET_INITIAL_STATE', () => { describe('SET_INITIAL_STATE', () => {
......
...@@ -2,7 +2,7 @@ import { GlLoadingIcon } from '@gitlab/ui'; ...@@ -2,7 +2,7 @@ import { GlLoadingIcon } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { createLocalVue, shallowMount } from '@vue/test-utils';
import Vuex from 'vuex'; import Vuex from 'vuex';
import Stacktrace from '~/error_tracking/components/stacktrace.vue'; import Stacktrace from '~/error_tracking/components/stacktrace.vue';
import SentryErrorStackTrace from '~/sentry_error_stack_trace/components/sentry_error_stack_trace.vue'; import SentryErrorStackTrace from '~/issues/sentry_error_stack_trace/components/sentry_error_stack_trace.vue';
const localVue = createLocalVue(); const localVue = createLocalVue();
localVue.use(Vuex); localVue.use(Vuex);
......
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