summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
commit05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch)
tree11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /.rubocop.yml
parentec73467c23693d0db63a797d10194da9e72a74af (diff)
downloadgitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 3a3150f9fbc..e58dd4f9fd0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -95,7 +95,6 @@ InternalAffairs/DeprecateCopHelper:
- spec/rubocop/**/*.rb
Lint/LastKeywordArgument:
- Enabled: true
Safe: false
Lint/EmptyFile:
@@ -409,6 +408,7 @@ Database/MultipleDatabases:
- 'ee/lib/ee/gitlab/background_migration/**/*.rb'
- 'spec/lib/gitlab/background_migration/**/*.rb'
- 'spec/lib/gitlab/database/**/*.rb'
+ - 'spec/tasks/gitlab/db_rake_spec.rb'
Migration/BatchMigrationsPostOnly:
Enabled: true
@@ -416,6 +416,11 @@ Migration/BatchMigrationsPostOnly:
- 'db/migrate/*.rb'
- 'db/post_migrate/*.rb'
+BackgroundMigration/FeatureCategory:
+ Enabled: true
+ Include:
+ - 'lib/gitlab/background_migration/*.rb'
+
# See https://gitlab.com/gitlab-org/gitlab/-/issues/373194
Gitlab/RSpec/AvoidSetup:
Enabled: true
@@ -909,5 +914,7 @@ Cop/FeatureFlagUsage:
- 'lib/gitlab/redis/**/*.rb'
- 'lib/gitlab/patch/**/*.rb'
- 'lib/gitlab/instrumentation/**/*.rb'
- Exclude:
- - 'lib/gitlab/redis/multi_store.rb'
+
+# See https://gitlab.com/gitlab-org/gitlab/-/issues/386618
+Layout/HashAlignment:
+ Enabled: false