From 3cccd102ba543e02725d247893729e5c73b38295 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Apr 2022 10:00:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-10-stable-ee --- .rubocop.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to '.rubocop.yml') diff --git a/.rubocop.yml b/.rubocop.yml index 99424713bd8..50729efd1ce 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -48,6 +48,7 @@ AllCops: Metrics/ParameterLists: Exclude: + # See https://gitlab.com/gitlab-org/gitlab/-/issues/356771 - 'app/components/**/*' Cop/AvoidKeywordArgumentsInSidekiqWorkers: @@ -94,6 +95,10 @@ Style/FrozenStringLiteralComment: Enabled: true EnforcedStyle: always_true +Style/SpecialGlobalVars: + # https://gitlab.com/gitlab-org/gitlab/-/issues/358427 + EnforcedStyle: use_perl_names + RSpec/FilePath: Exclude: - 'qa/**/*' @@ -134,6 +139,7 @@ Naming/FileName: - 'qa/qa/specs/**/*' - 'qa/tasks/**/*.rake' - '**/*.ru' + - 'app/graphql/types/issue_connection.rb' IgnoreExecutableScripts: true AllowedAcronyms: @@ -732,10 +738,6 @@ QA/SelectorUsage: Exclude: - 'spec/rubocop/**/*_spec.rb' -QA/DuplicateTestcaseLink: - # this cop is executed in static-analysis.gitlab-ci.yml since it cannot be run in parallel - Enabled: false - Performance/ActiveRecordSubtransactions: Exclude: - 'spec/**/*.rb' -- cgit v1.2.3