Commit e4a38770 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'cngo-organise-issuable-code' into 'master'

Move ~/issuable_create and ~/issuable_sidebar

See merge request gitlab-org/gitlab!75759
parents 193d99b9 ac27d830
<script> <script>
import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import IssuableBody from './issuable_body.vue'; import IssuableBody from './issuable_body.vue';
import IssuableDiscussion from './issuable_discussion.vue'; import IssuableDiscussion from './issuable_discussion.vue';
......
<script> <script>
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import createFlash from '~/flash'; import createFlash from '~/flash';
import IssuableCreate from '~/issuable_create/components/issuable_create_root.vue'; import IssuableCreate from '~/vue_shared/issuable/create/components/issuable_create_root.vue';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
......
...@@ -8,7 +8,7 @@ import { IssuableStatus } from '~/issue_show/constants'; ...@@ -8,7 +8,7 @@ import { IssuableStatus } from '~/issue_show/constants';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/issuable_show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';
import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { mockJiraIssue } from '../mock_data'; import { mockJiraIssue } from '../mock_data';
......
...@@ -10,7 +10,7 @@ import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; ...@@ -10,7 +10,7 @@ import IssuableHeader from '~/issuable_show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';
import IssuableDiscussion from '~/issuable_show/components/issuable_discussion.vue'; import IssuableDiscussion from '~/issuable_show/components/issuable_discussion.vue';
import Note from 'ee/external_issues_show/components/note.vue'; import Note from 'ee/external_issues_show/components/note.vue';
import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import httpStatusCodes from '~/lib/utils/http_status'; import httpStatusCodes from '~/lib/utils/http_status';
......
...@@ -4,8 +4,8 @@ import TestCaseCreateRoot from 'ee/test_case_create/components/test_case_create_ ...@@ -4,8 +4,8 @@ import TestCaseCreateRoot from 'ee/test_case_create/components/test_case_create_
import createTestCase from 'ee/test_case_create/queries/create_test_case.mutation.graphql'; import createTestCase from 'ee/test_case_create/queries/create_test_case.mutation.graphql';
import createFlash from '~/flash'; import createFlash from '~/flash';
import IssuableCreate from '~/issuable_create/components/issuable_create_root.vue'; import IssuableCreate from '~/vue_shared/issuable/create/components/issuable_create_root.vue';
import IssuableForm from '~/issuable_create/components/issuable_form.vue'; import IssuableForm from '~/vue_shared/issuable/create/components/issuable_form.vue';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
jest.mock('~/flash'); jest.mock('~/flash');
......
...@@ -10,7 +10,7 @@ import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue' ...@@ -10,7 +10,7 @@ import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/issuable_show/components/issuable_header.vue';
import IssuableShow from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';
import IssuableEventHub from '~/issuable_show/event_hub'; import IssuableEventHub from '~/issuable_show/event_hub';
import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import { mockProvide, mockTestCase } from '../mock_data'; import { mockProvide, mockTestCase } from '../mock_data';
......
...@@ -4,7 +4,7 @@ import IssuableBody from '~/issuable_show/components/issuable_body.vue'; ...@@ -4,7 +4,7 @@ import IssuableBody from '~/issuable_show/components/issuable_body.vue';
import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableHeader from '~/issuable_show/components/issuable_header.vue';
import IssuableShowRoot from '~/issuable_show/components/issuable_show_root.vue'; import IssuableShowRoot from '~/issuable_show/components/issuable_show_root.vue';
import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebar from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import { mockIssuableShowProps, mockIssuable } from '../mock_data'; import { mockIssuableShowProps, mockIssuable } from '../mock_data';
......
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import IssuableCreateRoot from '~/issuable_create/components/issuable_create_root.vue'; import IssuableCreateRoot from '~/vue_shared/issuable/create/components/issuable_create_root.vue';
import IssuableForm from '~/issuable_create/components/issuable_form.vue'; import IssuableForm from '~/vue_shared/issuable/create/components/issuable_form.vue';
const createComponent = ({ const createComponent = ({
descriptionPreviewPath = '/gitlab-org/gitlab-shell/preview_markdown', descriptionPreviewPath = '/gitlab-org/gitlab-shell/preview_markdown',
......
import { GlFormInput } from '@gitlab/ui'; import { GlFormInput } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import IssuableForm from '~/issuable_create/components/issuable_form.vue'; import IssuableForm from '~/vue_shared/issuable/create/components/issuable_form.vue';
import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import MarkdownField from '~/vue_shared/components/markdown/field.vue';
import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue';
......
...@@ -2,8 +2,8 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; ...@@ -2,8 +2,8 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import IssuableSidebarRoot from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import IssuableSidebarRoot from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
import { USER_COLLAPSED_GUTTER_COOKIE } from '~/issuable_sidebar/constants'; import { USER_COLLAPSED_GUTTER_COOKIE } from '~/vue_shared/issuable/sidebar/constants';
const MOCK_LAYOUT_PAGE_CLASS = 'layout-page'; const MOCK_LAYOUT_PAGE_CLASS = 'layout-page';
......
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