diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-16 22:36:08 +0000 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-21 21:07:55 +0000 |
| commit | 865222f52db79f3121d6f1c1cb428982c3e10bd9 (patch) | |
| tree | b97c993ce80c77acf779545bbe14b44e48b46f29 /app/assets/javascripts/merge_request.js | |
| parent | 53e46ddee8621969a8fbd7d019781fc5199d7f0a (diff) | |
| download | gitlab-ce-865222f52db79f3121d6f1c1cb428982c3e10bd9.tar.gz | |
Merge branch 'explicitly-disable-eslint-inline' into 'master'
explicitly disable eslint inline
## What does this MR do?
Explicitly disables eslint inline.
I.E. `/* eslint-disable */` => `/* eslint-disable max-len, no-new, ... */`
I used the script from https://gitlab.com/lbennett/eslint-dsblr.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
It will help refactor out eslint issues for older files.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [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?
See merge request !7229
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index d3bd1e846c1..a4b4db14db8 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -1,4 +1,4 @@ -/* eslint-disable */ +/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, no-undef, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, padded-blocks, max-len */ /*= require jquery.waitforimages */ /*= require task_list */ |