diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 35778f056b409c3ddb7d97f1e788ab0133a9dca3..d698214642643222cd058ad9e33e6a9a339dff1e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -323,6 +323,10 @@ Performance/Detect:
 Performance/MethodObjectAsBlock:
   Enabled: false
 
+# Offense count: 42
+Performance/OpenStruct:
+  Enabled: false
+
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.
@@ -376,6 +380,11 @@ RSpec/EmptyExampleGroup:
     - 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_spec.rb'
     - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb'
 
+# Offense count: 1162
+# Cop supports --auto-correct.
+RSpec/EmptyLineAfterFinalLetItBe:
+  Enabled: false
+
 # Offense count: 1428
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
diff --git a/Gemfile b/Gemfile
index c8240c3cdc287fde7340407bb660c1d4fcad5acb..10bd86c59aa1781f68565272ed3dcbc1ca75a6b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -377,7 +377,7 @@ group :development, :test do
   gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 6.1.0', require: false
+  gem 'gitlab-styles', '~> 6.2.0', require: false
 
   gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.7.0.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index aa08e41631d467cd8e7f28a57bb7ec9afdf9876b..ebfdb0243c97c07bc446f6faf8f4f9630ba63d92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,7 +472,7 @@ GEM
       pry (~> 0.13.0)
     gitlab-sidekiq-fetcher (0.5.5)
       sidekiq (~> 5)
-    gitlab-styles (6.1.0)
+    gitlab-styles (6.2.0)
       rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
       rubocop-performance (~> 1.9.2)
@@ -1432,7 +1432,7 @@ DEPENDENCIES
   gitlab-net-dns (~> 0.9.1)
   gitlab-pry-byebug
   gitlab-sidekiq-fetcher (= 0.5.5)
-  gitlab-styles (~> 6.1.0)
+  gitlab-styles (~> 6.2.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
diff --git a/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb b/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
index 13d26fa293a8d0936e32b2cbbc7eee7c1efed231..674bdde49071d0eae546d94e3f7f3997a3f27224 100644
--- a/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
+++ b/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
@@ -65,6 +65,7 @@
             updated_at: updated_at # Friday @ 6:00
           )
         end
+
         let_it_be(:active_period) { active_period_for_date_with_tz(updated_at, rotation) }
 
         around do |example|
@@ -171,6 +172,7 @@
             starts_at: starts_at
           )
         end
+
         let_it_be(:active_period) { active_period_for_date_with_tz(starts_at, rotation) }
         let_it_be(:existing_shift) do
           create(