From 9f99bf3b0e3516471806f3595e1619b8e9af2a80 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Feb 2023 09:09:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- rubocop/rubocop-ruby27.yml | 9 +++++++++ rubocop/rubocop-ruby30.yml | 22 +++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 rubocop/rubocop-ruby27.yml (limited to 'rubocop') diff --git a/rubocop/rubocop-ruby27.yml b/rubocop/rubocop-ruby27.yml new file mode 100644 index 00000000000..5c1b71f81e2 --- /dev/null +++ b/rubocop/rubocop-ruby27.yml @@ -0,0 +1,9 @@ +# RuboCop configuration adjustments during the transition time from Ruby 2.7 to +# Ruby 3.0. This configuration should be removed after the transition has been +# completed. + +# These cops are disabled in Ruby 3.0 (rubocop-30.yml). +Style/MutableConstant: + Enabled: false +Style/RedundantFreeze: + Enabled: false diff --git a/rubocop/rubocop-ruby30.yml b/rubocop/rubocop-ruby30.yml index b7634210e3d..d46bb9388a3 100644 --- a/rubocop/rubocop-ruby30.yml +++ b/rubocop/rubocop-ruby30.yml @@ -1,19 +1,15 @@ -# RuboCop configuration adjustments during the transition time from Ruby 2.7 to Ruby 3.0. -# This configuration should be removed after the transition has been completed. - -# Disable cops for now since their behavior changed in Ruby 3.0. -# See https://gitlab.com/gitlab-org/gitlab/-/jobs/3068345492 -# -# Migration plan: -# * Generate TODOs for these cops (with Ruby 3.0) right before the switch to Ruby 3.0 -# * Put these cops back in "grace period" to ensure `master` stability -# * Remove "grace period" after the switch -# * Incrementally fix TODOs +# RuboCop configuration adjustments during the transition time from Ruby 2.7 to +# Ruby 3.0. # +# After the transition has been completed: +# * Move all configuration which enable cops to .rubocop.yml. +# * Remove all reminaing configuration. + +# These cops are disabled in Ruby 2.7 (rubocop-27.yml). Style/MutableConstant: - Enabled: false + Enabled: true Style/RedundantFreeze: - Enabled: false + Enabled: true # No longer needed because Ruby 3.0 will fail due to kwargs issues. Lint/LastKeywordArgument: -- cgit v1.2.3