diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-12 10:55:46 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-12 10:55:46 +0000 |
| commit | bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc (patch) | |
| tree | 7404d154addee886ec82b31451df60cec9babb2d /spec/javascripts/notes/components | |
| parent | 57e84c305f124b7e68fb7e4c22d34a247a13d3dd (diff) | |
| parent | f248be7257e82d15fa6441c551e4314bd36343d4 (diff) | |
| download | gitlab-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/notes/components')
| -rw-r--r-- | spec/javascripts/notes/components/comment_form_spec.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/notes/components/note_app_spec.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/notes/components/noteable_note_spec.js | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/javascripts/notes/components/comment_form_spec.js b/spec/javascripts/notes/components/comment_form_spec.js index 6a7131528a3..90016436cb7 100644 --- a/spec/javascripts/notes/components/comment_form_spec.js +++ b/spec/javascripts/notes/components/comment_form_spec.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import Vue from 'vue'; import Autosize from 'autosize'; import store from '~/notes/stores'; diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js index e1c612f5100..ac39418c3e6 100644 --- a/spec/javascripts/notes/components/note_app_spec.js +++ b/spec/javascripts/notes/components/note_app_spec.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import _ from 'underscore'; import Vue from 'vue'; import notesApp from '~/notes/components/notes_app.vue'; diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/notes/components/noteable_note_spec.js index 88a7ffb0b9c..cfd037633e9 100644 --- a/spec/javascripts/notes/components/noteable_note_spec.js +++ b/spec/javascripts/notes/components/noteable_note_spec.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import _ from 'underscore'; import Vue from 'vue'; import store from '~/notes/stores'; |