Merge branch 'master' into 41723-babel41723-babel

* master: (67 commits)
  Remove Beta notice for Clusters
  Adds explanation to .codeclimate.yml file
  Disable eslint in codeclimate
  Fix broken modal
  Refactor dashboard milestone show inside dispatcher
  Refactor dashboard milestone index inside dispatcher
  Fix hooks not being set up properly for bare import Rake task
  Change order of reference notes in permissions docs
  Fix indention
  Fix indention
  Disable rule in  modal.vue breaking tests
  Revert "Fix Route validation for unchanged path"
  Revert "Add test for permanent redirects of descendants"
  Add test for permanent redirects of descendants
  Fix Route validation for unchanged path
  Fix broken tests
  Migrate GitlabProject (re)move project endpoints
  Add support for multiple refmaps to RemoteService#add_remote
  Fixing bug related to wiki last version
  Restore sidebar collapse button padding
  ...

2 files changed, 3 insertions, 4 deletions

diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js
index 24209be83fe..5f980bbf36c 100644
--- a/spec/javascripts/vue_shared/components/markdown/field_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js
@@ -12,14 +12,14 @@ describe('Markdown field component', () => {
 
   beforeEach((done) => {
     vm = new Vue({
+      components: {
+        fieldComponent,
+      },
       data() {
         return {
           text: 'testing\n123',
         };
       },
-      components: {
-        fieldComponent,
-      },
       template: `
         <field-component
           markdown-preview-path="/preview"
diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js
index b3b5dd1d10a..c63f15e5880 100644
--- a/spec/javascripts/vue_shared/components/table_pagination_spec.js
+++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js
@@ -72,7 +72,6 @@ describe('Pagination component', () => {
         });
 
         component.$el.querySelector('.js-previous-button a').click();
-
         expect(spy).toHaveBeenCalledWith(1);
       });
     });