diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 21:07:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 21:07:41 +0000 |
commit | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (patch) | |
tree | 5f08f2602120b0555e5c0dc0061d7c8eea054c22 /spec/spec_helper.rb | |
parent | 7cc6c10c68915f5019ab8c2029eeb462c8fed4ef (diff) | |
download | gitlab-ce-0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14.tar.gz |
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, 3 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2afe80f455e..1f0119108a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -159,6 +159,9 @@ RSpec.configure do |config| .with(:force_autodevops_on_by_default, anything) .and_return(false) + # Enable Marginalia feature for all specs in the test suite. + allow(Gitlab::Marginalia).to receive(:cached_feature_enabled?).and_return(true) + # The following can be removed once Vue Issuable Sidebar # is feature-complete and can be made default in place # of older sidebar. |