diff --git a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue similarity index 100% rename from app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue rename to app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue diff --git a/app/assets/javascripts/related_merge_requests/index.js b/app/assets/javascripts/issues/related_merge_requests/index.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/index.js rename to app/assets/javascripts/issues/related_merge_requests/index.js diff --git a/app/assets/javascripts/related_merge_requests/store/actions.js b/app/assets/javascripts/issues/related_merge_requests/store/actions.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/actions.js rename to app/assets/javascripts/issues/related_merge_requests/store/actions.js diff --git a/app/assets/javascripts/related_merge_requests/store/index.js b/app/assets/javascripts/issues/related_merge_requests/store/index.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/index.js rename to app/assets/javascripts/issues/related_merge_requests/store/index.js diff --git a/app/assets/javascripts/related_merge_requests/store/mutation_types.js b/app/assets/javascripts/issues/related_merge_requests/store/mutation_types.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/mutation_types.js rename to app/assets/javascripts/issues/related_merge_requests/store/mutation_types.js diff --git a/app/assets/javascripts/related_merge_requests/store/mutations.js b/app/assets/javascripts/issues/related_merge_requests/store/mutations.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/mutations.js rename to app/assets/javascripts/issues/related_merge_requests/store/mutations.js diff --git a/app/assets/javascripts/related_merge_requests/store/state.js b/app/assets/javascripts/issues/related_merge_requests/store/state.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/state.js rename to app/assets/javascripts/issues/related_merge_requests/store/state.js diff --git a/app/assets/javascripts/sentry_error_stack_trace/components/sentry_error_stack_trace.vue b/app/assets/javascripts/issues/sentry_error_stack_trace/components/sentry_error_stack_trace.vue similarity index 100% rename from app/assets/javascripts/sentry_error_stack_trace/components/sentry_error_stack_trace.vue rename to app/assets/javascripts/issues/sentry_error_stack_trace/components/sentry_error_stack_trace.vue diff --git a/app/assets/javascripts/sentry_error_stack_trace/index.js b/app/assets/javascripts/issues/sentry_error_stack_trace/index.js similarity index 100% rename from app/assets/javascripts/sentry_error_stack_trace/index.js rename to app/assets/javascripts/issues/sentry_error_stack_trace/index.js diff --git a/app/assets/javascripts/issues/show.js b/app/assets/javascripts/issues/show.js index 33b1c47b4feb7ab3e72f3db531aeb9a0b00a1fba..0c02d137f2983924ec02db219a5d2202807e63ca 100644 --- a/app/assets/javascripts/issues/show.js +++ b/app/assets/javascripts/issues/show.js @@ -8,8 +8,8 @@ import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue'; import { parseIssuableData } from '~/issues/show/utils/parse_data'; import initNotesApp from '~/notes'; import { store } from '~/notes/stores'; -import initRelatedMergeRequestsApp from '~/related_merge_requests'; -import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace'; +import initRelatedMergeRequestsApp from '~/issues/related_merge_requests'; +import initSentryErrorStackTraceApp from '~/issues/sentry_error_stack_trace'; import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning'; import ZenMode from '~/zen_mode'; diff --git a/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js similarity index 94% rename from spec/frontend/related_merge_requests/components/related_merge_requests_spec.js rename to spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js index 486fb6992759eef7344c17ee52d867f9d08e544f..d8060a1fc09195794117e53289762095eeda86c8 100644 --- a/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js +++ b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js @@ -2,8 +2,8 @@ import { mount, createLocalVue } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import mockData from 'test_fixtures/issues/related_merge_requests.json'; import axios from '~/lib/utils/axios_utils'; -import RelatedMergeRequests from '~/related_merge_requests/components/related_merge_requests.vue'; -import createStore from '~/related_merge_requests/store/index'; +import RelatedMergeRequests from '~/issues/related_merge_requests/components/related_merge_requests.vue'; +import createStore from '~/issues/related_merge_requests/store/index'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; const API_ENDPOINT = '/api/v4/projects/2/issues/33/related_merge_requests'; diff --git a/spec/frontend/related_merge_requests/store/actions_spec.js b/spec/frontend/issues/related_merge_requests/store/actions_spec.js similarity index 94% rename from spec/frontend/related_merge_requests/store/actions_spec.js rename to spec/frontend/issues/related_merge_requests/store/actions_spec.js index 3bd07c34b6f86ef1aa4e801ee373572ade3e6bfc..5f232fee09bfadbbd52f77fc2e67d77beb344c12 100644 --- a/spec/frontend/related_merge_requests/store/actions_spec.js +++ b/spec/frontend/issues/related_merge_requests/store/actions_spec.js @@ -2,8 +2,8 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import * as actions from '~/related_merge_requests/store/actions'; -import * as types from '~/related_merge_requests/store/mutation_types'; +import * as actions from '~/issues/related_merge_requests/store/actions'; +import * as types from '~/issues/related_merge_requests/store/mutation_types'; jest.mock('~/flash'); diff --git a/spec/frontend/related_merge_requests/store/mutations_spec.js b/spec/frontend/issues/related_merge_requests/store/mutations_spec.js similarity index 89% rename from spec/frontend/related_merge_requests/store/mutations_spec.js rename to spec/frontend/issues/related_merge_requests/store/mutations_spec.js index 436c7dca6ce8948017bedbc00c23202fc1c9ade3..0e3d26b3879ae2bdcb2750609d21b50a77778e0d 100644 --- a/spec/frontend/related_merge_requests/store/mutations_spec.js +++ b/spec/frontend/issues/related_merge_requests/store/mutations_spec.js @@ -1,5 +1,5 @@ -import * as types from '~/related_merge_requests/store/mutation_types'; -import mutations from '~/related_merge_requests/store/mutations'; +import * as types from '~/issues/related_merge_requests/store/mutation_types'; +import mutations from '~/issues/related_merge_requests/store/mutations'; describe('RelatedMergeRequests Store Mutations', () => { describe('SET_INITIAL_STATE', () => { diff --git a/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js b/spec/frontend/issues/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js similarity index 94% rename from spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js rename to spec/frontend/issues/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js index 772d6903052da46c31b5704c3b10c4bac7c246aa..5a51ae3cfe0c62ea0463c4ecf5073febe4c52393 100644 --- a/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js +++ b/spec/frontend/issues/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js @@ -2,7 +2,7 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; 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(); localVue.use(Vuex);