diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-07 12:28:59 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-07 12:28:59 +0100 |
| commit | abcba5c19885f789557fe1fa62dba7f176d9afe6 (patch) | |
| tree | 67628941bd27b7887f92ae758db7d81f34823e62 /.codeclimate.yml | |
| parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
| parent | 6d7daf6154b1edbfe9a0c0b297baab8cd45658f3 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
Diffstat (limited to '.codeclimate.yml')
| -rw-r--r-- | .codeclimate.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml index 571507a54..9817d7f1c 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -27,10 +27,10 @@ plugins: enabled: true eslint: enabled: true - channel: eslint-5 + channel: eslint-6 rubocop: enabled: true - channel: rubocop-0-71 + channel: rubocop-0-76 sass-lint: enabled: true exclude_patterns: |