diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /.rubocop.yml | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index ed17799478a..bff2b7a32b1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -308,6 +308,18 @@ Gitlab/Union: - 'spec/**/*' - 'ee/spec/**/*' +API/GrapeAPIInstance: + Enabled: true + Include: + - 'lib/**/api/**/*.rb' + - 'ee/**/api/**/*.rb' + +API/GrapeArrayMissingCoerce: + Enabled: true + Include: + - 'lib/**/api/**/*.rb' + - 'ee/**/api/**/*.rb' + Cop/SidekiqOptionsQueue: Enabled: true Exclude: @@ -316,6 +328,9 @@ Cop/SidekiqOptionsQueue: Graphql/AuthorizeTypes: Enabled: true + Include: + - 'app/graphql/types/**/*' + - 'ee/app/graphql/types/**/*' Exclude: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' @@ -450,10 +465,17 @@ Rails/TimeZone: - 'spec/models/**/*' - 'ee/app/models/**/*' - 'ee/spec/models/**/*' + - 'app/workers/**/*' + - 'spec/workers/**/*' + - 'ee/app/workers/**/*' + - 'ee/spec/workers/**/*' + # WIP: See https://gitlab.com/gitlab-org/gitlab/-/issues/220040 Rails/SaveBang: Enabled: true + AllowImplicitReturn: false + AllowedReceivers: ['ActionDispatch::TestRequest'] Include: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' |