diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /.rubocop.yml | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 58 |
1 files changed, 42 insertions, 16 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 4bf2392867d..5b7a58e1f2d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -106,25 +106,31 @@ RSpec/MultipleMemoizedHelpers: Naming/FileName: ExpectMatchingDefinition: true + CheckDefinitionPathHierarchy: false Exclude: + - '**/*/*.builder' + - 'ee/bin/*' + - 'config.ru' + - 'config/**/*' + - 'ee/config/**/*' + - 'jh/config/**/*' - 'db/**/*' - 'ee/db/**/*' + - 'ee/elastic/migrate/*' + - 'lib/tasks/**/*.rake' + - 'ee/lib/tasks/**/*.rake' + - 'lib/generators/**/*' + - 'ee/lib/generators/**/*' + - 'scripts/**/*' - 'spec/**/*' - - 'features/**/*' + - 'tooling/bin/**/*' - 'ee/spec/**/*' + - 'jh/spec/**/*' + - 'qa/bin/*' - 'qa/spec/**/*' - 'qa/qa/specs/**/*' - - 'qa/bin/*' - - 'ee/bin/*' - - 'config/**/*' - - 'ee/config/**/*' - - 'lib/generators/**/*' - - 'locale/unfound_translations.rb' - - 'ee/locale/unfound_translations.rb' - - 'ee/lib/generators/**/*' - - 'qa/qa/scenario/test/integration/ldap_no_tls.rb' - - 'qa/qa/scenario/test/integration/ldap_tls.rb' - - 'qa/tasks/*' + - 'qa/tasks/**/*.rake' + - '**/*.ru' IgnoreExecutableScripts: true AllowedAcronyms: @@ -146,6 +152,26 @@ Naming/FileName: - CI - CD - OAuth + - CSP + - CSV + - SCA + - SAN + - CIDR + - SPDX + - MR + - SSE + - JWT + - HLL + - GPG + - OTP + - GID + - AR + - RSpec + - ECDSA + - ED25519 + - GitLab + - JavaScript + - VSCode # default ones: - CLI - DSL @@ -682,10 +708,6 @@ Cop/UserAdmin: - 'spec/**/*.rb' - 'ee/spec/**/*.rb' -Performance/OpenStruct: - Exclude: - - 'ee/spec/**/*.rb' - # See https://gitlab.com/gitlab-org/gitlab/-/issues/327495 Style/RegexpLiteral: Enabled: false @@ -712,6 +734,10 @@ 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' |