diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-09 00:09:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-09 00:09:52 +0300 |
commit | 81c0f29ad962733b0750bdab2d3250e2c796a578 (patch) | |
tree | 42d31d9c48d156849c87aee7f4c3c494d2ca6260 /app/assets/javascripts/pages | |
parent | 842ac3526cba09feb4b9ccefd0aeeb6edc02035d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
4 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/pages/projects/network/network.js b/app/assets/javascripts/pages/projects/network/network.js index 5f2014f1631..b88127384dc 100644 --- a/app/assets/javascripts/pages/projects/network/network.js +++ b/app/assets/javascripts/pages/projects/network/network.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import BranchGraph from '../../../network/branch_graph'; +import BranchGraph from '~/network/branch_graph'; const vph = $(window).height() - 250; diff --git a/app/assets/javascripts/pages/sessions/new/index.js b/app/assets/javascripts/pages/sessions/new/index.js index 8c2fd624a83..b62417cf595 100644 --- a/app/assets/javascripts/pages/sessions/new/index.js +++ b/app/assets/javascripts/pages/sessions/new/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import initVueAlerts from '~/vue_alerts'; -import NoEmojiValidator from '../../../emoji/no_emoji_validator'; +import NoEmojiValidator from '~/emoji/no_emoji_validator'; import LengthValidator from './length_validator'; import OAuthRememberMe from './oauth_remember_me'; import preserveUrlFragment from './preserve_url_fragment'; diff --git a/app/assets/javascripts/pages/sessions/new/length_validator.js b/app/assets/javascripts/pages/sessions/new/length_validator.js index 17acad10bc1..b2074fb1e39 100644 --- a/app/assets/javascripts/pages/sessions/new/length_validator.js +++ b/app/assets/javascripts/pages/sessions/new/length_validator.js @@ -1,4 +1,4 @@ -import InputValidator from '../../../validators/input_validator'; +import InputValidator from '~/validators/input_validator'; const errorMessageClass = 'gl-field-error'; diff --git a/app/assets/javascripts/pages/shared/wikis/edit.js b/app/assets/javascripts/pages/shared/wikis/edit.js index beeabfde1a6..02878633916 100644 --- a/app/assets/javascripts/pages/shared/wikis/edit.js +++ b/app/assets/javascripts/pages/shared/wikis/edit.js @@ -3,8 +3,8 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import csrf from '~/lib/utils/csrf'; import Translate from '~/vue_shared/translate'; -import GLForm from '../../../gl_form'; -import ZenMode from '../../../zen_mode'; +import GLForm from '~/gl_form'; +import ZenMode from '~/zen_mode'; import deleteWikiModal from './components/delete_wiki_modal.vue'; import wikiAlert from './components/wiki_alert.vue'; import wikiForm from './components/wiki_form.vue'; |