Commit 4e49092a authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'leipert-move-jquery-endless-scroll' into 'master'

Move jquery.endless-scroll import away from main

See merge request gitlab-org/gitlab!33267
parents 0d52dd33 12bb2586
...@@ -2,7 +2,6 @@ import 'jquery'; ...@@ -2,7 +2,6 @@ import 'jquery';
// common jQuery plugins // common jQuery plugins
import 'jquery-ujs'; import 'jquery-ujs';
import 'vendor/jquery.endless-scroll';
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 $ from 'jquery'; import $ from 'jquery';
import 'vendor/jquery.endless-scroll';
import { getParameterByName } from '~/lib/utils/common_utils'; import { getParameterByName } from '~/lib/utils/common_utils';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { removeParams } from '~/lib/utils/url_utility'; import { removeParams } from '~/lib/utils/url_utility';
......
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