summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2016-10-27 21:35:07 +0200
committerwinniehell <git@winniehell.de>2016-10-27 21:35:07 +0200
commit4060807719a9d721248ce910cf4bf50e2838a498 (patch)
treeff6c9102d7f93e97c0348561bcc9816f93c6d5d6
parente5950e687c42db006daf9147254e111f4e68c3f1 (diff)
downloadgitlab-ce-4060807719a9d721248ce910cf4bf50e2838a498.tar.gz
Enable linting for ES6 files
-rw-r--r--app/assets/javascripts/boards/components/board_sidebar.js.es61
-rw-r--r--app/assets/javascripts/boards/filters/due_date_filters.js.es61
-rw-r--r--app/assets/javascripts/boards/models/milestone.js.es61
-rw-r--r--app/assets/javascripts/header.js1
-rw-r--r--package.json4
-rw-r--r--spec/javascripts/dashboard_spec.js.es61
-rw-r--r--spec/javascripts/header_spec.js1
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 */