Merge branch...

Merge branch '334788-follow-up-from-disable-rspec-option-filter-focus-and-run_all_when_everything_filtered-on-ci' into 'master'

Resolve "Follow-up from "Disable RSpec option filter focus and run_all_when_everything_filtered on CI [RUN ALL RSPEC]""

See merge request gitlab-org/gitlab!65126

spec/fast_spec_helper.rb

@@ -25,6 +25,8 @@ ActiveSupport::XmlMini.backend = 'Nokogiri'
 
 RSpec.configure do |config|
   unless ENV['CI']
+    # Allow running `:focus` examples locally,
+    # falling back to all tests when there is no `:focus` example.
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
   end

spec/spec_helper.rb

@@ -110,8 +110,11 @@ RSpec.configure do |config|
   end
 
   unless ENV['CI']
+    # Allow running `:focus` examples locally,
+    # falling back to all tests when there is no `:focus` example.
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
+
     # Re-run failures locally with `--only-failures`
     config.example_status_persistence_file_path = './spec/examples.txt'
   end