summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-02-27 13:10:30 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-02-27 13:10:30 +0000
commitb3c0253c53eb0b996ad84ecbe397803fcfef95e0 (patch)
treef65e247c94b3941f49af63b9f64c37e5d94f73af
parent9dac9b7d220a3e1637f00c0af585a654940f6de3 (diff)
parent22ad0842d693c90e65fe6a616e0889759de7bfbc (diff)
downloadgitlab-ce-b3c0253c53eb0b996ad84ecbe397803fcfef95e0.tar.gz
Merge branch '41851-enable-eslint-codeclimate' into 'master'
Resolve "Enable eslint in codeclimate" Closes #41851 See merge request gitlab-org/gitlab-ce!17392
-rw-r--r--.codeclimate.yml4
-rw-r--r--changelogs/unreleased/41851-enable-eslint-codeclimate.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml
index b02fe54a4ff..333a70f71d3 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -11,8 +11,8 @@ engines:
exclude_paths:
- "lib/api/v3/*"
eslint:
- # eslint-plugin-vue is locked to version 2 in codeclimate, we need version 4
- enabled: false
+ enabled: true
+ channel: "eslint-4"
rubocop:
enabled: true
channel: "gitlab-rubocop-0-52-1"
diff --git a/changelogs/unreleased/41851-enable-eslint-codeclimate.yml b/changelogs/unreleased/41851-enable-eslint-codeclimate.yml
new file mode 100644
index 00000000000..98924f3eae8
--- /dev/null
+++ b/changelogs/unreleased/41851-enable-eslint-codeclimate.yml
@@ -0,0 +1,5 @@
+---
+title: Enables eslint in codeclimate job
+merge_request: 17392
+author:
+type: other