Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 3 deletions

diff --git a/lib/tasks/gitlab/import_export/import.rake b/lib/tasks/gitlab/import_export/import.rake
index 42b36873519..a88fb88c7ef 100644
--- a/lib/tasks/gitlab/import_export/import.rake
+++ b/lib/tasks/gitlab/import_export/import.rake
@@ -64,16 +64,25 @@ class GitlabProjectImport
 
   private
 
+  def with_request_store
+    RequestStore.begin!
+    yield
+  ensure
+    RequestStore.end!
+    RequestStore.clear!
+  end
+
   # We want to ensure that all Sidekiq jobs are executed
   # synchronously as part of that process.
   # This ensures that all expensive operations do not escape
   # to general Sidekiq clusters/nodes.
   def run_isolated_sidekiq_job
     Sidekiq::Testing.fake! do
-      @project = create_project
-
-      execute_sidekiq_job
+      with_request_store do
+        @project = create_project
 
+        execute_sidekiq_job
+      end
       true
     end
   end