Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ddda3ede083..9a49c57e48c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -304,10 +304,10 @@ RSpec.configure do |config|
     RequestStore.clear!
   end
 
-  config.around do |example|
+  config.around(:example, :context_aware) do |example|
     # Wrap each example in it's own context to make sure the contexts don't
     # leak
-    Labkit::Context.with_context { example.run }
+    Gitlab::ApplicationContext.with_raw_context { example.run }
   end
 
   config.around do |example|