Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7c4e2ec3ecc..8d86611407e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -391,6 +391,11 @@ RSpec.configure do |config|
     Gitlab::WithRequestStore.with_request_store { example.run }
   end
 
+  config.around(:example, :enable_rugged) do |example|
+    # Skip tests that need rugged when using praefect DB.
+    example.run unless GitalySetup.praefect_with_db?
+  end
+
   # previous test runs may have left some resources throttled
   config.before do
     ::Gitlab::ExclusiveLease.reset_all!("el:throttle:*")