summaryrefslogtreecommitdiff
path: root/spec/javascripts/bootstrap_jquery_spec.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-12 10:55:46 +0000
committerPhil Hughes <me@iamphill.com>2018-03-12 10:55:46 +0000
commitbd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc (patch)
tree7404d154addee886ec82b31451df60cec9babb2d /spec/javascripts/bootstrap_jquery_spec.js
parent57e84c305f124b7e68fb7e4c22d34a247a13d3dd (diff)
parentf248be7257e82d15fa6441c551e4314bd36343d4 (diff)
downloadgitlab-ce-bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc.tar.gz
Merge branch 'remove-jquery-globals' into 'master'
Require jQuery to be explicitly imported See merge request gitlab-org/gitlab-ce!17674
Diffstat (limited to 'spec/javascripts/bootstrap_jquery_spec.js')
-rw-r--r--spec/javascripts/bootstrap_jquery_spec.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/bootstrap_jquery_spec.js b/spec/javascripts/bootstrap_jquery_spec.js
index 48994b7c523..0fd6f9dc810 100644
--- a/spec/javascripts/bootstrap_jquery_spec.js
+++ b/spec/javascripts/bootstrap_jquery_spec.js
@@ -1,5 +1,6 @@
/* eslint-disable space-before-function-paren, no-var */
+import $ from 'jquery';
import '~/commons/bootstrap';
(function() {