diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 09:10:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 09:10:46 +0000 |
commit | 2e9f877e8b6dd58c8011745b1d9a28dd67c8179c (patch) | |
tree | 0e2d42aa2ef1c3ae386b54962815623466a3dd54 /spec/spec_helper.rb | |
parent | c86c0e01469fd7c9aa72283db23d539c02f44bdb (diff) | |
download | gitlab-ce-2e9f877e8b6dd58c8011745b1d9a28dd67c8179c.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, 0 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 64c1479a412..2c745a0a70c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -249,9 +249,6 @@ RSpec.configure do |config| unstub_all_feature_flags end - # Enable Marginalia feature for all specs in the test suite. - Gitlab::Marginalia.enabled = true - # Stub these calls due to being expensive operations # It can be reenabled for specific tests via: # |