Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-03-13 17:02:19 +0300
committerClement Ho <clemmakesapps@gmail.com>2019-03-13 17:02:19 +0300
commit7f3719f328b791c1622a3c36c3d4d4a7f48e3256 (patch)
treecfde2e2485621a032aa0058d511ed62bae4d9dbf /app/assets/javascripts/commons/jquery.js
parent3c40c57383cdcc9e35b93d1f8142f531557ee414 (diff)
Prefer node_modules At.js and jquery.carat versions
Remove references to the vendored copies of At.js and jquery.carat as well as the legacy rails wrapper gem.
Diffstat (limited to 'app/assets/javascripts/commons/jquery.js')
-rw-r--r--app/assets/javascripts/commons/jquery.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js
index 009153d0703..2f268419bff 100644
--- a/app/assets/javascripts/commons/jquery.js
+++ b/app/assets/javascripts/commons/jquery.js
@@ -3,7 +3,7 @@ import 'jquery';
// common jQuery plugins
import 'jquery-ujs';
import 'vendor/jquery.endless-scroll';
-import 'vendor/jquery.caret';
-import 'vendor/jquery.atwho';
+import 'jquery.caret'; // must be imported before at.js
+import 'at.js';
import 'vendor/jquery.scrollTo';
import 'jquery.waitforimages';