diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:08:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:08:43 +0300 |
| commit | 733befe96ad19f5a02e442c4a9cc8059d3aabbda (patch) | |
| tree | dcabd344df040e536a242edc4e3121fb3efca142 /app/assets/javascripts/commons | |
| parent | 10213bf3b26c3c21f7683471d35d1cd052c41e9c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/jquery.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js index 2f268419bff..25640f71af2 100644 --- a/app/assets/javascripts/commons/jquery.js +++ b/app/assets/javascripts/commons/jquery.js @@ -4,6 +4,6 @@ import 'jquery'; import 'jquery-ujs'; import 'vendor/jquery.endless-scroll'; import 'jquery.caret'; // must be imported before at.js -import 'at.js'; +import '@gitlab/at.js'; import 'vendor/jquery.scrollTo'; import 'jquery.waitforimages'; |