From 8015f09545c35b833f4955fc2e0b8f1a3214cbcb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 24 May 2022 18:09:18 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/spec_helper.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a8b5908c57e..6c9a11587d3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -256,16 +256,6 @@ RSpec.configure do |config| end config.around do |example| - if example.metadata.fetch(:stub_feature_flags, true) - # It doesn't make sense for this to default to enabled as we only plan to - # use this temporarily to override an environment variable but eventually - # we'll just use the environment variable value when we've completed the - # gradual rollout. This stub must happen in around block as there are other - # around blocks in tests that will run before this and get the wrong - # database connection. - stub_feature_flags(force_no_sharing_primary_model: false) - end - example.run end -- cgit v1.2.3