diff --git a/_support/vendor-gitlab-git b/_support/vendor-gitlab-git
index f8f18f7cc2d6784a360b1889f53eaee7e0c591bc..9c7d53148d4ce8c871ea576ba64cab93683b9081 100755
--- a/_support/vendor-gitlab-git
+++ b/_support/vendor-gitlab-git
@@ -21,7 +21,7 @@ def main
 
   Dir.mktmpdir do |dir|
     gitlab_dir = File.join(dir, 'gitlab')
-    run!(%W[git clone --depth=1 -b #{revision} #{REMOTE}.git #{gitlab_dir}])
+    run!(%W[git clone -q --depth=1 -b #{revision} #{REMOTE}.git #{gitlab_dir}])
     revision_sha = capture!(%w[git rev-parse HEAD], gitlab_dir).chomp
 
     FileUtils.rm_rf(VENDOR_DIR)
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 3055ec8b2b8260a4cf8462da6b5d0c1778221978..adf6b5f36b9f0e056c51a528900e549a73424704 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -5,6 +5,7 @@ gem 'gitaly-proto', '~> 0.54.0', require: 'gitaly'
 gem 'activesupport'
 gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'request_store', '~> 1.3'
 
 group :development, :test do
   gem 'gitlab-styles', '~> 2.0.0', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 25daf8e098ab674c12bdc4e6039017fd70d2b892..dec41896423bf0c08a9311242450ea98a2b55c09 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -87,6 +87,7 @@ GEM
     rainbow (2.2.2)
       rake
     rake (12.1.0)
+    request_store (1.3.2)
     rouge (2.2.1)
     rubocop (0.50.0)
       parallel (~> 1.10)
@@ -124,6 +125,7 @@ DEPENDENCIES
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
+  request_store (~> 1.3)
 
 BUNDLED WITH
    1.16.0
diff --git a/ruby/lib/gitlab/gitaly_client.rb b/ruby/lib/gitlab/gitaly_client.rb
index 5e7b71559d54facaa5315dd3f064a757af1b6b4d..1681b4549655eeb74a39723b185d7fe55c581340 100644
--- a/ruby/lib/gitlab/gitaly_client.rb
+++ b/ruby/lib/gitlab/gitaly_client.rb
@@ -2,6 +2,8 @@ module Gitlab
   module GitalyClient
     module MigrationStatus
       OPT_IN = :fake_constant
+      OPT_OUT = :fake_constant
+      DISABLED = :fake_constant
     end
 
     class << self