diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-24 16:24:03 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-24 16:24:03 +0000 |
| commit | 48fb05c97796a40d467be1e0758637ffbafd3a2d (patch) | |
| tree | 8cecd03dfe7823b62f1122c1d7b4c83ca498ed46 | |
| parent | 2a6227a9fca46ca5c982f1cb75754fb1c722b360 (diff) | |
| parent | 7598cf62b8d19df546a0d9b65c3ae63ce9bc6ada (diff) | |
| download | gitlab-ce-48fb05c97796a40d467be1e0758637ffbafd3a2d.tar.gz | |
Merge branch 'fix-eslint' into 'master'
Fix eslint errors in master
Closes #32862
See merge request !11684
| -rw-r--r-- | spec/javascripts/copy_as_gfm_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/copy_as_gfm_spec.js b/spec/javascripts/copy_as_gfm_spec.js index 1a850bb56ab..ded450749d3 100644 --- a/spec/javascripts/copy_as_gfm_spec.js +++ b/spec/javascripts/copy_as_gfm_spec.js @@ -1,4 +1,4 @@ -require('~/copy_as_gfm'); +import '~/copy_as_gfm'; (() => { describe('gl.CopyAsGFM', () => { diff --git a/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js b/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js index 0ebb867b851..79447787fc9 100644 --- a/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js +++ b/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import eventHub from '~/filtered_search/event_hub'; import RecentSearchesDropdownContent from '~/filtered_search/components/recent_searches_dropdown_content'; -require('~/filtered_search/filtered_search_token_keys'); +import '~/filtered_search/filtered_search_token_keys'; const createComponent = (propsData) => { const Component = Vue.extend(RecentSearchesDropdownContent); |