diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-18 18:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-18 18:09:08 +0300 |
| commit | cc1066db64a2a283a3d229b9bbb67c01716ca871 (patch) | |
| tree | c5a518fabe9bb87b17a1f99b6c2616144170ebeb /spec/spec_helper.rb | |
| parent | 5c5d24f032b67d98452f391192386e330a0f880c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
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 |