Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 0 deletions

diff --git a/rubocop/rubocop-ruby31.yml b/rubocop/rubocop-ruby31.yml
index 109c7ca2dfe..712c5a8f447 100644
--- a/rubocop/rubocop-ruby31.yml
+++ b/rubocop/rubocop-ruby31.yml
@@ -2,6 +2,7 @@
 # Ruby 3.1.
 #
 # After the transition has been completed:
+# * Enable all disabled cops and resolve the offenses.
 # * Move all configuration which enabled or tweaked cops to .rubocop.yml.
 # * Remove all remaining configuration.
 
diff --git a/rubocop/rubocop-ruby32.yml b/rubocop/rubocop-ruby32.yml
new file mode 100644
index 00000000000..0d0e8a46c60
--- /dev/null
+++ b/rubocop/rubocop-ruby32.yml
@@ -0,0 +1,15 @@
+# RuboCop configuration adjustments during the transition time from Ruby 3.1 to
+# Ruby 3.2.
+#
+# After the transition has been completed:
+# * Enable all disabled cops and resolve the offenses.
+# * Move all configuration which enabled or tweaked cops to .rubocop.yml.
+# * Remove all remaining configuration.
+
+# Short-hand Hash syntax does not work prior 3.1.
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never
+
+# With 3.2+ `require 'set'` is no longer needed as it's always loaded.
+Lint/RedundantRequireStatement:
+  Enabled: false