Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 3 deletions

diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml
index e78a38d31f5..1dd8351f692 100644
--- a/spec/frontend/.eslintrc.yml
+++ b/spec/frontend/.eslintrc.yml
@@ -6,6 +6,12 @@ plugins:
 extends:
   - 'plugin:jest/recommended'
 settings:
+  # We have to teach eslint-plugin-import what node modules we use
+  # otherwise there is an error when it tries to resolve them
+  import/core-modules:
+    - events
+    - fs
+    - path  
   import/resolver:
     jest:
       jestConfigFile: 'jest.config.js'
diff --git a/spec/frontend/gl_field_errors_spec.js b/spec/frontend/gl_field_errors_spec.js
index 4653f519f65..078659bf429 100644
--- a/spec/frontend/gl_field_errors_spec.js
+++ b/spec/frontend/gl_field_errors_spec.js
@@ -1,5 +1,3 @@
-/* eslint-disable arrow-body-style */
-
 import $ from 'jquery';
 import GlFieldErrors from '~/gl_field_errors';
 
diff --git a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js
index b00261ae067..ca75c55df26 100644
--- a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js
+++ b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js
@@ -18,7 +18,7 @@ describe('IssueAssigneesComponent', () => {
         ...props,
       },
     });
-    vm = wrapper.vm; // eslint-disable-line
+    vm = wrapper.vm;
   };
 
   const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text();