diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-13 09:10:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-13 09:10:27 +0300 |
| commit | ae6730843ac7f8489d52a79b16cd35d75c7a5852 (patch) | |
| tree | 316fc170d9041ebd72965bbbb3a845a681085dff /spec/spec_helper.rb | |
| parent | 528bc843128d799b95c611693c420122f4cede62 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6f659b3a41d..9f96162e629 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -312,9 +312,6 @@ RSpec.configure do |config| # 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) - # Will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/369875 - stub_feature_flags(override_group_level_protected_environment_settings_permission: false) - allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags |