diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 15:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 15:10:04 +0300 |
| commit | 998adcc422d4161515bf2960ef4dce71258f69a3 (patch) | |
| tree | 34ffbf53b8587d3367457d4175fc8dfd71477dca /spec/spec_helper.rb | |
| parent | e2c471038ab2b4f09487c1feb74520f74f834986 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4179e6f7e91..4a3227cc9f5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -275,6 +275,15 @@ RSpec.configure do |config| # https://gitlab.com/groups/gitlab-org/-/epics/5531 stub_feature_flags(refactor_blob_viewer: false) + # Disable `main_branch_over_master` as we migrate + # from `master` to `main` accross our codebase. + # It's done in order to preserve the concistency in tests + # As we're ready to change `master` usages to `main`, let's enable it + stub_feature_flags(main_branch_over_master: false) + + # Selectively disable by actor https://docs.gitlab.com/ee/development/feature_flags/#selectively-disable-by-actor + stub_feature_flags(remove_description_html_in_release_api_override: false) + allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags |