Merge branch '24756-clean-up-eslintrc-globals' into 'master'

Clean up globals exemptions within .eslintrc ## What does this MR do? Removes unnecessarily-exempted globals from `.eslintrc` where possible. ## Are there points in the code the reviewer needs to double check? `npm run eslint` should return 0 errors. ## Why was this MR needed? see Issue #24756 ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24756 See merge request !7642

Merge branch '24756-clean-up-eslintrc-globals' into 'master'
536ec509 · Alfredo Sumaran · ead44226 · a571a61f · 536ec509 · 536ec509
Commit 536ec509 authored Nov 23, 2016 by Alfredo Sumaran
18 changed files
--- a/.eslintrc
+++ b/.eslintrc
 {
+  "env": {
+    "browser": true,
+    "es6": true
+  },
  "extends": "airbnb",
+  "globals": {
+    "$": false,
+    "_": false,
+    "gl": false,
+    "gon": false,
+    "jQuery": false
+  },
  "plugins": [
    "filenames"
  ],
  "rules": {
    "filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"]
-  },
-  "globals": {
-    "$": false,
-    "_": false,
-    "beforeEach": false,
-    "d3": false,
-    "define": false,
-    "describe": false,
-    "document": false,
-    "expect": false,
-    "fixture": false,
-    "gl": false,
-    "it": false,
-    "jQuery": false,
-    "Mousetrap": false,
-    "spyOn": false,
-    "spyOnEvent": false,
-    "Turbolinks": false,
-    "window": false,
-    "Vue": false,
-    "Flash": false,
-    "Cookies": false
  }
 }
--- a/app/assets/javascripts/activities.js.es6
+++ b/app/assets/javascripts/activities.js.es6
 /* eslint-disable no-param-reassign, class-methods-use-this */
-/* global Pager, Cookies */
+/* global Pager */
+/* global Cookies */

 ((global) => {
  class Activities {

--- a/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_code_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_production_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_test_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6
 /* eslint-disable no-param-reassign */
+/* global Vue */
+
 ((global) => {
  global.cycleAnalytics = global.cycleAnalytics || {};


--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6
+/* global Vue */
+/* global Cookies */
+/* global Flash */
+
 //= require vue
 //= require_tree ./svg
 //= require_tree .

--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
+/* eslint-disable no-param-reassign */
+/* global Vue */
+/* global EnvironmentsService */
+
 //= require vue
 //= require vue-resource
 //= require_tree ../services/
 //= require ./environment_item

-/* globals Vue, EnvironmentsService */
-/* eslint-disable no-param-reassign */
-
-(() => { // eslint-disable-line
+(() => {
  window.gl = window.gl || {};

  /**

--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -6,7 +6,8 @@
 /*= require ./environment_stop */
 /*= require ./environment_rollback */

-/* globals Vue, timeago */
+/* global Vue */
+/* global timeago */

 (() => {
  /**

--- a/app/assets/javascripts/logo.js
+++ b/app/assets/javascripts/logo.js
 /* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, padded-blocks */
+/* global Turbolinks */
+
 (function() {
  Turbolinks.enableProgressBar();


--- a/app/assets/javascripts/tree.js
+++ b/app/assets/javascripts/tree.js
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, quotes, consistent-return, no-var, one-var, one-var-declaration-per-line, no-else-return, prefer-arrow-callback, padded-blocks, max-len */
+/* global Turbolinks */
 (function() {
  this.TreeView = (function() {
    function TreeView() {

--- a/spec/javascripts/.eslintrc
+++ b/spec/javascripts/.eslintrc
@@ -7,5 +7,9 @@
  "rules": {
    "prefer-arrow-callback": 0,
    "func-names": 0
+  },
+  "globals": {
+    "fixture": false,
+    "spyOnEvent": false
  }
 }
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
-/* global Build */
 /* eslint-disable no-new */
+/* global Build */
+/* global Turbolinks */
+
 //= require lib/utils/timeago
 //= require lib/utils/datetime_utility
 //= require build

--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
+/* global environmentsList */
+
 //= require vue
 //= require environments/stores/environments_store
 //= require ./mock_data
-/* globals environmentsList */
+
 (() => {
  beforeEach(() => {
    gl.environmentsList.EnvironmentsStore.create();