Commit f95b62ea authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'leipert-move-wait-for-images' into 'master'

Move jquery.waitforimages import away from main

See merge request gitlab-org/gitlab!33269
parents f9d56c4f 0b99b3f9
/* eslint-disable func-names, consistent-return, one-var, no-return-assign */ /* eslint-disable func-names, consistent-return, one-var, no-return-assign */
import $ from 'jquery'; import $ from 'jquery';
import 'jquery.waitforimages';
// Width where images must fits in, for 2-up this gets divided by 2 // Width where images must fits in, for 2-up this gets divided by 2
const availWidth = 900; const availWidth = 900;
......
...@@ -5,4 +5,3 @@ import 'jquery-ujs'; ...@@ -5,4 +5,3 @@ import 'jquery-ujs';
import 'jquery.caret'; // must be imported before at.js import 'jquery.caret'; // must be imported before at.js
import '@gitlab/at.js'; import '@gitlab/at.js';
import 'vendor/jquery.scrollTo'; import 'vendor/jquery.scrollTo';
import 'jquery.waitforimages';
import $ from 'jquery'; import $ from 'jquery';
import 'jquery.waitforimages';
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 NotificationsForm from '~/notifications_form'; import NotificationsForm from '~/notifications_form';
......
import $ from 'jquery'; import $ from 'jquery';
import 'jquery.waitforimages';
import Vue from 'vue'; import Vue from 'vue';
import initBlob from '~/blob_edit/blob_bundle'; import initBlob from '~/blob_edit/blob_bundle';
import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue';
......
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