summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-06 18:09:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-06 18:09:38 +0000
commit73886079f3f877ffb8f8938d700643a5e99bc849 (patch)
treeff8f3c64df680962c1da38156e8c1e63a015b0fb /.rubocop.yml
parenta7beadc83470bd9ce23757a019795f49f95a6fff (diff)
downloadgitlab-ce-73886079f3f877ffb8f8938d700643a5e99bc849.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index fbcad46a0c7..92861717cab 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -212,11 +212,13 @@ Gitlab/HTTParty:
- 'ee/spec/**/*'
Gitlab/Json:
- Enabled: false
+ Enabled: true
Exclude:
- 'db/**/*'
- 'qa/**/*'
- 'scripts/**/*'
+ - 'lib/rspec_flaky/**/*'
+ - 'lib/quality/**/*'
GitlabSecurity/PublicSend:
Enabled: true