Merge branch 'fj-fix-unstabbing-ff-in-test' into 'master'

Disable :main_branch_over_master ff on before suite

See merge request gitlab-org/gitlab!84042

spec/spec_helper.rb

@@ -237,6 +237,7 @@ RSpec.configure do |config|
     # Enable all features by default for testing
     # Reset any changes in after hook.
     stub_all_feature_flags
+    stub_feature_flags(main_branch_over_master: false)
 
     TestEnv.seed_db
   end