diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /.rubocop.yml | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 47dc85a79f0..cc65727e94d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -293,7 +293,15 @@ Gitlab/AvoidFeatureGet: Enabled: true RSpec/TimecopFreeze: - Enabled: false + Enabled: true + AutoCorrect: true + Include: + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' + - 'qa/spec/**/*.rb' + +RSpec/TimecopTravel: + Enabled: true AutoCorrect: true Include: - 'spec/**/*.rb' @@ -327,7 +335,7 @@ Gitlab/Union: - 'spec/**/*' - 'ee/spec/**/*' -API/GrapeAPIInstance: +API/Base: Enabled: true Include: - 'lib/**/api/**/*.rb' @@ -354,6 +362,21 @@ Graphql/AuthorizeTypes: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' +Graphql/GIDExpectedType: + Enabled: true + Include: + - 'app/graphql/**/*' + - 'ee/app/graphql/**/*' + Exclude: + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' + +Graphql/IDType: + Enabled: true + Include: + - 'app/graphql/**/*' + - 'ee/app/graphql/**/*' + Graphql/JSONType: Enabled: true Include: @@ -548,3 +571,9 @@ Gitlab/RailsLogger: Exclude: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' + +# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606 +FactoryBot/InlineAssociation: + Include: + - 'spec/factories/**/*.rb' + - 'ee/spec/factories/**/*.rb' |