Commit 087090ff authored by Jiaan Louw's avatar Jiaan Louw

Merge branch 'cngo-shorten-import-paths' into 'master'

Shorten JS import paths

See merge request gitlab-org/gitlab!84003
parents 234b56f6 92bd05a4
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import CiIcon from '../../../../vue_shared/components/ci_icon.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue';
export default { export default {
components: { components: {
......
import initFilePickers from '~/file_pickers'; import initFilePickers from '~/file_pickers';
import BindInOut from '../../../../behaviors/bind_in_out'; import BindInOut from '~/behaviors/bind_in_out';
import Group from '../../../../group'; import Group from '~/group';
(() => { (() => {
BindInOut.initAll(); BindInOut.initAll();
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import Vue from 'vue'; import Vue from 'vue';
import { getCookie, setCookie, parseBoolean } from '~/lib/utils/common_utils'; import { getCookie, setCookie, parseBoolean } from '~/lib/utils/common_utils';
import Translate from '~/vue_shared/translate';
import Translate from '../../../../../vue_shared/translate';
Vue.use(Translate); Vue.use(Translate);
......
...@@ -3,9 +3,9 @@ import Vue from 'vue'; ...@@ -3,9 +3,9 @@ import Vue from 'vue';
import { __ } from '~/locale'; import { __ } from '~/locale';
import RefSelector from '~/ref/components/ref_selector.vue'; import RefSelector from '~/ref/components/ref_selector.vue';
import { REF_TYPE_BRANCHES, REF_TYPE_TAGS } from '~/ref/constants'; import { REF_TYPE_BRANCHES, REF_TYPE_TAGS } from '~/ref/constants';
import setupNativeFormVariableList from '../../../../ci_variable_list/native_form_variable_list'; import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list';
import GlFieldErrors from '../../../../gl_field_errors'; import GlFieldErrors from '~/gl_field_errors';
import Translate from '../../../../vue_shared/translate'; import Translate from '~/vue_shared/translate';
import intervalPatternInput from './components/interval_pattern_input.vue'; import intervalPatternInput from './components/interval_pattern_input.vue';
import TimezoneDropdown from './components/timezone_dropdown'; import TimezoneDropdown from './components/timezone_dropdown';
......
import $ from 'jquery'; import $ from 'jquery';
import GLForm from '../../../../gl_form'; import GLForm from '~/gl_form';
import RefSelectDropdown from '../../../../ref_select_dropdown'; import RefSelectDropdown from '~/ref_select_dropdown';
import ZenMode from '../../../../zen_mode'; import ZenMode from '~/zen_mode';
new ZenMode(); // eslint-disable-line no-new new ZenMode(); // eslint-disable-line no-new
new GLForm($('.tag-form')); // eslint-disable-line no-new new GLForm($('.tag-form')); // eslint-disable-line no-new
......
import $ from 'jquery'; import $ from 'jquery';
import initTree from 'ee_else_ce/repository'; import initTree from 'ee_else_ce/repository';
import initBlob from '~/blob_edit/blob_bundle'; import initBlob from '~/blob_edit/blob_bundle';
import ShortcutsNavigation from '../../../../behaviors/shortcuts/shortcuts_navigation'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
import NewCommitForm from '../../../../new_commit_form'; import NewCommitForm from '~/new_commit_form';
new NewCommitForm($('.js-create-dir-form')); // eslint-disable-line no-new new NewCommitForm($('.js-create-dir-form')); // eslint-disable-line no-new
initBlob(); initBlob();
......
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import { numberToHumanSize } from '../../../../lib/utils/number_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils';
export default { export default {
components: { components: {
......
...@@ -5,7 +5,7 @@ import SignInLegacyButton from '~/jira_connect/subscriptions/components/sign_in_ ...@@ -5,7 +5,7 @@ import SignInLegacyButton from '~/jira_connect/subscriptions/components/sign_in_
import SignInOauthButton from '~/jira_connect/subscriptions/components/sign_in_oauth_button.vue'; import SignInOauthButton from '~/jira_connect/subscriptions/components/sign_in_oauth_button.vue';
import SubscriptionsList from '~/jira_connect/subscriptions/components/subscriptions_list.vue'; import SubscriptionsList from '~/jira_connect/subscriptions/components/subscriptions_list.vue';
import createStore from '~/jira_connect/subscriptions/store'; import createStore from '~/jira_connect/subscriptions/store';
import { I18N_DEFAULT_SIGN_IN_BUTTON_TEXT } from '../../../../../app/assets/javascripts/jira_connect/subscriptions/constants'; import { I18N_DEFAULT_SIGN_IN_BUTTON_TEXT } from '~/jira_connect/subscriptions/constants';
jest.mock('~/jira_connect/subscriptions/utils'); jest.mock('~/jira_connect/subscriptions/utils');
......
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