diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 18:12:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 18:12:00 +0300 |
| commit | 6323146895db2be6f04846b3c98060b7349207b9 (patch) | |
| tree | 9b29de45421be0a9a6126001bd920d780467b1db /.rubocop.yml | |
| parent | 2779809e45970e7660521b94dbebcf24ed00d60d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index b87752aec3b..7c24b1f4e87 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,12 +13,6 @@ inherit_from: <% end %> - '.rubocop_todo.yml' <% end %> - <% if RUBY_VERSION[/^\d+\.\d+/, 0] == '3.1' %> - - ./rubocop/rubocop-ruby31.yml - <% end %> - <% if RUBY_VERSION[/^\d+\.\d+/, 0] == '3.2' %> - - ./rubocop/rubocop-ruby32.yml - <% end %> - ./rubocop/rubocop-migrations.yml - ./rubocop/rubocop-usage-data.yml - ./rubocop/rubocop-code_reuse.yml @@ -1119,3 +1113,8 @@ Style/SymbolProc: # See https://gitlab.com/gitlab-org/gitlab/-/issues/434151 - each_batch - each_sub_batch + +# Short-hand Hash syntax does not work prior 3.1. +# See https://gitlab.com/gitlab-org/gitlab/-/issues/435940#note_1703307479 +Style/HashSyntax: + EnforcedShorthandSyntax: never |