diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-01 18:07:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-01 18:07:40 +0300 |
| commit | 04e74bf311de04c1334343a35fe9954953c6413d (patch) | |
| tree | d2d3e62216291c93bb24a79d9221b0eca3efadcb /spec/spec_helper.rb | |
| parent | 098ec8c914f61780b33bb18e929e25ef59dfb175 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6d0969e8688..7383fc91bc1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -260,8 +260,9 @@ RSpec.configure do |config| # tests, until we introduce it in user settings stub_feature_flags(forti_token_cloud: false) - # This feature flag is by default disabled and used in disaster recovery mode - stub_feature_flags(ci_queueing_disaster_recovery: false) + # These feature flag are by default disabled and used in disaster recovery mode + stub_feature_flags(ci_queueing_disaster_recovery_disable_fair_scheduling: false) + stub_feature_flags(ci_queueing_disaster_recovery_disable_quota: false) enable_rugged = example.metadata[:enable_rugged].present? |