diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-27 19:42:41 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-27 19:42:41 +0000 |
| commit | 85bd6296a72194f9d044829456616195765611c4 (patch) | |
| tree | 9dd97653a637a6f4de1c168ab5b9d52600f1523a | |
| parent | 4635b47a115a82faa564160225d66e1d7abb7d6d (diff) | |
| parent | 4060807719a9d721248ce910cf4bf50e2838a498 (diff) | |
| download | gitlab-ce-85bd6296a72194f9d044829456616195765611c4.tar.gz | |
Merge branch 'fix-linting' into 'master'
Enable linting for ES6 files
## What does this MR do?
Add `.js.es6` to file extensions checked by ESLint.
## What are the relevant issue numbers?
Follows !5445
See merge request !7156
| -rw-r--r-- | app/assets/javascripts/boards/components/board_sidebar.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/filters/due_date_filters.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/models/milestone.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/header.js | 1 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | spec/javascripts/dashboard_spec.js.es6 | 1 | ||||
| -rw-r--r-- | spec/javascripts/header_spec.js | 1 |
7 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js.es6 b/app/assets/javascripts/boards/components/board_sidebar.js.es6 index e83e69247d9..4928320d015 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js.es6 +++ b/app/assets/javascripts/boards/components/board_sidebar.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable */ (() => { const Store = gl.issueBoards.BoardsStore; diff --git a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 index 50ef1911022..9eceac4eddd 100644 --- a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 +++ b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable */ Vue.filter('due-date', (value) => { const date = new Date(value); return $.datepicker.formatDate('M d, yy', date); diff --git a/app/assets/javascripts/boards/models/milestone.js.es6 b/app/assets/javascripts/boards/models/milestone.js.es6 index 577adf11265..a48969e19c9 100644 --- a/app/assets/javascripts/boards/models/milestone.js.es6 +++ b/app/assets/javascripts/boards/models/milestone.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable */ class ListMilestone { constructor (obj) { this.id = obj.id; diff --git a/app/assets/javascripts/header.js b/app/assets/javascripts/header.js index 5215ce9c4ba..81fcaf06430 100644 --- a/app/assets/javascripts/header.js +++ b/app/assets/javascripts/header.js @@ -1,3 +1,4 @@ +/* eslint-disable */ (function() { $(document).on('todo:toggle', function(e, count) { diff --git a/package.json b/package.json index 942b2113e65..d440307bd10 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "private": true, "scripts": { - "eslint": "eslint .", - "eslint-fix": "eslint --fix ." + "eslint": "eslint --ext .js,.js.es6 .", + "eslint-fix": "eslint --fix --ext .js,.js.es6 ." }, "devDependencies": { "eslint": "^3.1.1", diff --git a/spec/javascripts/dashboard_spec.js.es6 b/spec/javascripts/dashboard_spec.js.es6 index 8021145d8e8..f54794634c1 100644 --- a/spec/javascripts/dashboard_spec.js.es6 +++ b/spec/javascripts/dashboard_spec.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable */ /*= require sidebar */ /*= require jquery */ /*= require jquery.cookie */ diff --git a/spec/javascripts/header_spec.js b/spec/javascripts/header_spec.js index b9d023a9aae..9a859655d8b 100644 --- a/spec/javascripts/header_spec.js +++ b/spec/javascripts/header_spec.js @@ -1,3 +1,4 @@ +/* eslint-disable */ /*= require header */ /*= require lib/utils/text_utility */ /*= require jquery */ |