summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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