diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 18:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 18:09:44 +0300 |
| commit | b85aae44f96c152c62952f4d3051223cdf0692be (patch) | |
| tree | 8ce4385b899e0f55b58368c8d5d15b430a8af205 /app/assets/javascripts/commons | |
| parent | 79850719759d6fe1b0682fd27573d479c9013f03 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/index.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/commons/jquery.js | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/javascripts/commons/index.js b/app/assets/javascripts/commons/index.js index e0d012cef23..77c85d85e27 100644 --- a/app/assets/javascripts/commons/index.js +++ b/app/assets/javascripts/commons/index.js @@ -1,5 +1,4 @@ import './polyfills'; -import './jquery'; import './bootstrap'; import './vue'; import '../lib/utils/axios_utils'; diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js deleted file mode 100644 index 334f95bb27f..00000000000 --- a/app/assets/javascripts/commons/jquery.js +++ /dev/null @@ -1,4 +0,0 @@ -import 'jquery'; - -// common jQuery plugins -import 'jquery-ujs'; |