Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/gitlab/with_request_store.rb b/lib/gitlab/with_request_store.rb
index d6c05e1e256..d13cd9a72f7 100644
--- a/lib/gitlab/with_request_store.rb
+++ b/lib/gitlab/with_request_store.rb
@@ -2,12 +2,24 @@
 
 module Gitlab
   module WithRequestStore
-    def with_request_store
+    def with_request_store(&block)
+      # Skip enabling the request store if it was already active. Whatever
+      # instantiated the request store first is responsible for clearing it
+      return yield if RequestStore.active?
+
+      enabling_request_store(&block)
+    end
+
+    private
+
+    def enabling_request_store
       RequestStore.begin!
       yield
     ensure
       RequestStore.end!
       RequestStore.clear!
     end
+
+    extend self
   end
 end