Commit ec918846 authored by Phil Hughes's avatar Phil Hughes

fixed some files being moved incorrectly

parent f58a6162
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import icon from '../../../vue_shared/components/icon.vue'; import icon from '~/vue_shared/components/icon.vue';
import listItem from './list_item.vue'; import listItem from './list_item.vue';
import listCollapsed from './list_collapsed.vue'; import listCollapsed from './list_collapsed.vue';
......
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import icon from '../../../vue_shared/components/icon.vue'; import icon from '~/vue_shared/components/icon.vue';
export default { export default {
components: { components: {
......
<script> <script>
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import router from '~/ide/ide_router'; import router from 'ee/ide/ide_router';
import icon from '../../../vue_shared/components/icon.vue'; import icon from '~/vue_shared/components/icon.vue';
export default { export default {
components: { components: {
......
<script> <script>
import icon from '~/vue_shared/components/icon.vue';
import newModal from './modal.vue'; import newModal from './modal.vue';
import upload from './upload.vue'; import upload from './upload.vue';
import icon from '../../../vue_shared/components/icon.vue';
export default { export default {
components: { components: {
......
<script> <script>
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { __ } from '../../../locale'; import { __ } from '~/locale';
import modal from '../../../vue_shared/components/modal.vue'; import modal from '~/vue_shared/components/modal.vue';
export default { export default {
components: { components: {
......
import Vue from 'vue'; import Vue from 'vue';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import flash from '~/flash';
import store from './stores'; import store from './stores';
import flash from '../flash';
import { import {
getTreeEntry, getTreeEntry,
} from './stores/utils'; } from './stores/utils';
......
import Vue from 'vue'; import Vue from 'vue';
import Translate from '~/vue_shared/translate';
import ide from './components/ide.vue'; import ide from './components/ide.vue';
import store from './stores'; import store from './stores';
import router from './ide_router'; import router from './ide_router';
import Translate from '../vue_shared/translate';
function initIde(el) { function initIde(el) {
if (!el) return null; if (!el) return null;
...@@ -18,8 +18,6 @@ function initIde(el) { ...@@ -18,8 +18,6 @@ function initIde(el) {
return createElement('ide', { return createElement('ide', {
props: { props: {
emptyStateSvgPath: el.dataset.emptyStateSvgPath, emptyStateSvgPath: el.dataset.emptyStateSvgPath,
noChangesStateSvgPath: el.dataset.noChangesStateSvgPath,
committedStateSvgPath: el.dataset.committedStateSvgPath,
}, },
}); });
}, },
......
import Vue from 'vue'; import Vue from 'vue';
import VueResource from 'vue-resource'; import VueResource from 'vue-resource';
import Api from '../../api'; import Api from '~/api';
Vue.use(VueResource); Vue.use(VueResource);
......
import flash from '~/flash';
import service from '../../services'; import service from '../../services';
import flash from '../../../flash';
import * as types from '../mutation_types'; import * as types from '../mutation_types';
export const getBranchData = ( export const getBranchData = (
......
import { normalizeHeaders } from '../../../lib/utils/common_utils'; import { normalizeHeaders } from '~/lib/utils/common_utils';
import flash from '../../../flash'; import flash from '~/flash';
import service from '../../services'; import service from '../../services';
import * as types from '../mutation_types'; import * as types from '../mutation_types';
import router from '../../ide_router'; import router from '../../ide_router';
......
import flash from '~/flash';
import service from '../../services'; import service from '../../services';
import flash from '../../../flash';
import * as types from '../mutation_types'; import * as types from '../mutation_types';
// eslint-disable-next-line import/prefer-default-export // eslint-disable-next-line import/prefer-default-export
......
import { visitUrl } from '../../../lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
import { normalizeHeaders } from '../../../lib/utils/common_utils'; import { normalizeHeaders } from '~/lib/utils/common_utils';
import flash from '../../../flash'; import flash from '~/flash';
import service from '../../services'; import service from '../../services';
import * as types from '../mutation_types'; import * as types from '../mutation_types';
import router from '../../ide_router'; import router from '../../ide_router';
......
import { sprintf, __ } from '~/locale'; import { sprintf, __ } from '~/locale';
import * as rootTypes from '~/ide/stores/mutation_types'; import * as rootTypes from 'ee/ide/stores/mutation_types';
import { createCommitPayload, createNewMergeRequestUrl } from '~/ide/stores/utils'; import { createCommitPayload, createNewMergeRequestUrl } from 'ee/ide/stores/utils';
import router from '~/ide/ide_router'; import router from 'ee/ide/ide_router';
import service from '~/ide/services'; import service from 'ee/ide/services';
import flash from '~/flash'; import flash from '~/flash';
import { stripHtml } from '~/lib/utils/text_utility'; import { stripHtml } from '~/lib/utils/text_utility';
import * as types from './mutation_types'; import * as types from './mutation_types';
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import store from 'ee/ide/stores'; import store from 'ee/ide/stores';
import commitActions from 'ee/ide/components/commit_sidebar/actions.vue'; import commitActions from 'ee/ide/components/commit_sidebar/actions.vue';
import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { resetStore } from 'spec/repo/helpers'; import { resetStore } from 'spec/ide/helpers';
describe('IDE commit sidebar actions', () => { describe('IDE commit sidebar actions', () => {
let vm; let vm;
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import store from 'ee/ide/stores'; import store from 'ee/ide/stores';
import radioGroup from 'ee/ide/components/commit_sidebar/radio_group.vue'; import radioGroup from 'ee/ide/components/commit_sidebar/radio_group.vue';
import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { resetStore } from 'spec/repo/helpers'; import { resetStore } from 'spec/ide/helpers';
describe('IDE commit sidebar radio group', () => { describe('IDE commit sidebar radio group', () => {
let vm; let vm;
......
...@@ -4,7 +4,7 @@ import router from 'ee/ide/ide_router'; ...@@ -4,7 +4,7 @@ import router from 'ee/ide/ide_router';
import * as urlUtils from '~/lib/utils/url_utility'; import * as urlUtils from '~/lib/utils/url_utility';
import eventHub from 'ee/ide/eventhub'; import eventHub from 'ee/ide/eventhub';
import * as consts from 'ee/ide/stores/modules/commit/constants'; import * as consts from 'ee/ide/stores/modules/commit/constants';
import { resetStore, file } from 'spec/repo/helpers'; import { resetStore, file } from 'spec/ide/helpers';
describe('IDE commit module actions', () => { describe('IDE commit module actions', () => {
afterEach(() => { afterEach(() => {
......
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