summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes/components/note_body.vue
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 /app/assets/javascripts/notes/components/note_body.vue
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 'app/assets/javascripts/notes/components/note_body.vue')
-rw-r--r--app/assets/javascripts/notes/components/note_body.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue
index ca12df9db64..a94f1a28a4c 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/notes/components/note_body.vue
@@ -1,4 +1,5 @@
<script>
+ import $ from 'jquery';
import noteEditedText from './note_edited_text.vue';
import noteAwardsList from './note_awards_list.vue';
import noteAttachment from './note_attachment.vue';