diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-23 06:12:33 +0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-24 18:35:50 +0300 |
commit | 18ed4aba35a66c05e5ebca5a3c9ff301b8a0efd0 (patch) | |
tree | c1b6eb44da957b2c2be67948cfe2566279d30134 /.eslintrc | |
parent | ac129ef83a29589da73b4dece6c6e828cc1a5ee8 (diff) |
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
Diffstat (limited to '.eslintrc')
-rw-r--r-- | .eslintrc | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/.eslintrc b/.eslintrc index 5850c107a02..788a88487d8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,31 +1,20 @@ { + "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 } } |