diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /.rubocop.yml | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index cc65727e94d..34d6fe5e434 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,16 +7,18 @@ require: - rubocop-rspec inherit_from: + - .rubocop_manual_todo.yml - .rubocop_todo.yml - ./rubocop/rubocop-migrations.yml - ./rubocop/rubocop-usage-data.yml + - ./rubocop/rubocop-code_reuse.yml inherit_mode: merge: - Include AllCops: - TargetRubyVersion: 2.6 + TargetRubyVersion: 2.7 TargetRailsVersion: 6.0 Exclude: - 'vendor/**/*' @@ -353,6 +355,12 @@ Cop/SidekiqOptionsQueue: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' +Graphql/ResolverType: + Enabled: true + Include: + - 'app/graphql/resolvers/**/*' + - 'ee/app/graphql/resolvers/**/*' + Graphql/AuthorizeTypes: Enabled: true Include: |