From cc1066db64a2a283a3d229b9bbb67c01716ca871 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 18 Jul 2022 15:09:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/spec_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 56027aa02c8..47cd78873f8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -330,6 +330,10 @@ RSpec.configure do |config| # most cases. We do test the email verification flow in the appropriate specs. stub_feature_flags(require_email_verification: false) + # This feature flag is for selectively disabling by actor, therefore we don't enable it by default. + # See https://docs.gitlab.com/ee/development/feature_flags/#selectively-disable-by-actor + stub_feature_flags(legacy_merge_request_state_check_for_merged_result_pipelines: false) + allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags -- cgit v1.2.3