Move gitlab-shell out of ruby/vendor

115 files changed, 9 insertions, 43 deletions

diff --git a/_support/makegen.go b/_support/makegen.go
index 413a98d31..82e924062 100644
--- a/_support/makegen.go
+++ b/_support/makegen.go
@@ -77,7 +77,7 @@ func (gm *gitalyMake) GoVendor() string          { return "bin/govendor" }
 func (gm *gitalyMake) StaticCheck() string       { return filepath.Join(gm.BuildDir(), "bin/staticcheck") }
 func (gm *gitalyMake) CoverageDir() string       { return filepath.Join(gm.BuildDir(), "cover") }
 func (gm *gitalyMake) GitalyRubyDir() string     { return filepath.Join(gm.SourceDir(), "ruby") }
-func (gm *gitalyMake) GitlabShellRelDir() string { return "ruby/vendor/gitlab-shell" }
+func (gm *gitalyMake) GitlabShellRelDir() string { return "ruby/gitlab-shell" }
 func (gm *gitalyMake) GitlabShellDir() string {
 	return filepath.Join(gm.SourceDir(), gm.GitlabShellRelDir())
 }
diff --git a/_support/vendor-gitlab-shell b/_support/vendor-gitlab-shell
deleted file mode 100755
index c5fdbc99f..000000000
--- a/_support/vendor-gitlab-shell
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'tempfile'
-
-require_relative 'run'
-
-REMOTE = 'https://gitlab.com/gitlab-org/gitlab-shell.git'
-REMOVE_PATHS = %w[go support spec/action .git spec/gitlab_shell_gitlab_shell_spec.rb].freeze
-
-def main
-  Dir.mktmpdir do |dir|
-    run!(%W[git clone --depth=1 --quiet #{REMOTE} gitlab-shell], dir)
-    tmp_shell_dir = File.join(dir, 'gitlab-shell')
-
-    run!(%w[mv README.md README.orig.md], tmp_shell_dir)
-
-    revision = capture!(%w[git rev-parse HEAD], tmp_shell_dir).chomp
-    remote_project = REMOTE.sub(/\.git$/, '')
-
-    readme = <<-EOS
-# gitlab-shell
-
-Vendored from #{remote_project} at [#{revision}](#{remote_project}/commit/#{revision}).
-
-Original README: [README.orig.md](README.orig.md).
-EOS
-    File.write(File.join(tmp_shell_dir, 'README.md'), readme)
-
-    run!(%w[rm -rf --] + REMOVE_PATHS, tmp_shell_dir)
-
-    gitlab_init = File.join(tmp_shell_dir, 'lib/gitlab_init.rb')
-    gitlab_init_contents = File.read(gitlab_init)
-    File.write(gitlab_init, gitlab_init_contents.sub(/^GITALY_EMBEDDED =.*/, 'GITALY_EMBEDDED = true'))
-
-    shell_vendor_dir = 'ruby/vendor/gitlab-shell'
-    run!(%W[mkdir -p #{shell_vendor_dir}])
-    run!(%W[rsync -av --delete #{tmp_shell_dir}/ #{shell_vendor_dir}/])
-  end
-end
-
-main
diff --git a/changelogs/unreleased/gitlab-shell-no-vendor.yml b/changelogs/unreleased/gitlab-shell-no-vendor.yml
new file mode 100644
index 000000000..80df6e76d
--- /dev/null
+++ b/changelogs/unreleased/gitlab-shell-no-vendor.yml
@@ -0,0 +1,5 @@
+---
+title: Move gitlab-shell out of ruby/vendor
+merge_request: 1173
+author:
+type: changed
diff --git a/ruby/.rubocop.yml b/ruby/.rubocop.yml
index ac84a3285..53b654cc3 100644
--- a/ruby/.rubocop.yml
+++ b/ruby/.rubocop.yml
@@ -4,6 +4,8 @@ AllCops:
   Exclude:
     - 'tmp/**/*'
     - 'vendor/**/*'
+    # TODO stop ignoring gitlab-shell/ https://gitlab.com/gitlab-org/gitaly/issues/1592
+    - 'gitlab-shell/**/*'
 
 Style/NumericPredicate:
   Enabled: false
diff --git a/ruby/git-hooks/gitlab-shell-hook b/ruby/git-hooks/gitlab-shell-hook
index 487b0a870..7ad435b18 100755
--- a/ruby/git-hooks/gitlab-shell-hook
+++ b/ruby/git-hooks/gitlab-shell-hook
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # This is the single source of truth for where Gitaly's embedded Git hooks are.
-hooks_dir="$(dirname $0)/../vendor/gitlab-shell/hooks"
+hooks_dir="$(dirname $0)/../gitlab-shell/hooks"
 
 exec "$hooks_dir/$(basename $0)" "$@"
diff --git a/ruby/vendor/gitlab-shell/.codeclimate.yml b/ruby/gitlab-shell/.codeclimate.yml
index 172b2e384..172b2e384 100644
--- a/ruby/vendor/gitlab-shell/.codeclimate.yml
+++ b/ruby/gitlab-shell/.codeclimate.yml
diff --git a/ruby/vendor/gitlab-shell/.gitignore b/ruby/gitlab-shell/.gitignore
index 4ea71fb3f..4ea71fb3f 100644
--- a/ruby/vendor/gitlab-shell/.gitignore
+++ b/ruby/gitlab-shell/.gitignore
diff --git a/ruby/vendor/gitlab-shell/.gitlab-ci.yml b/ruby/gitlab-shell/.gitlab-ci.yml
index 72b886427..72b886427 100644
--- a/ruby/vendor/gitlab-shell/.gitlab-ci.yml
+++ b/ruby/gitlab-shell/.gitlab-ci.yml
diff --git a/ruby/vendor/gitlab-shell/.rubocop.yml b/ruby/gitlab-shell/.rubocop.yml
index 66b795173..66b795173 100644
--- a/ruby/vendor/gitlab-shell/.rubocop.yml
+++ b/ruby/gitlab-shell/.rubocop.yml
diff --git a/ruby/vendor/gitlab-shell/.ruby-version b/ruby/gitlab-shell/.ruby-version
index 00355e29d..00355e29d 100644
--- a/ruby/vendor/gitlab-shell/.ruby-version
+++ b/ruby/gitlab-shell/.ruby-version
diff --git a/ruby/vendor/gitlab-shell/CHANGELOG b/ruby/gitlab-shell/CHANGELOG
index 4396dd207..4396dd207 100644
--- a/ruby/vendor/gitlab-shell/CHANGELOG
+++ b/ruby/gitlab-shell/CHANGELOG
diff --git a/ruby/vendor/gitlab-shell/CONTRIBUTING.md b/ruby/gitlab-shell/CONTRIBUTING.md
index 32b7d2348..32b7d2348 100644
--- a/ruby/vendor/gitlab-shell/CONTRIBUTING.md
+++ b/ruby/gitlab-shell/CONTRIBUTING.md
diff --git a/ruby/vendor/gitlab-shell/Gemfile b/ruby/gitlab-shell/Gemfile
index cabe4079d..cabe4079d 100644
--- a/ruby/vendor/gitlab-shell/Gemfile
+++ b/ruby/gitlab-shell/Gemfile
diff --git a/ruby/vendor/gitlab-shell/Gemfile.lock b/ruby/gitlab-shell/Gemfile.lock
index 3e79a1c24..3e79a1c24 100644
--- a/ruby/vendor/gitlab-shell/Gemfile.lock
+++ b/ruby/gitlab-shell/Gemfile.lock
diff --git a/ruby/vendor/gitlab-shell/LICENSE b/ruby/gitlab-shell/LICENSE
index 06c55d0ae..06c55d0ae 100644
--- a/ruby/vendor/gitlab-shell/LICENSE
+++ b/ruby/gitlab-shell/LICENSE
diff --git a/ruby/vendor/gitlab-shell/README.md b/ruby/gitlab-shell/README.md
index e65e76602..e65e76602 100644
--- a/ruby/vendor/gitlab-shell/README.md
+++ b/ruby/gitlab-shell/README.md
diff --git a/ruby/vendor/gitlab-shell/README.orig.md b/ruby/gitlab-shell/README.orig.md
index 7cb961943..7cb961943 100644
--- a/ruby/vendor/gitlab-shell/README.orig.md
+++ b/ruby/gitlab-shell/README.orig.md
diff --git a/ruby/vendor/gitlab-shell/VERSION b/ruby/gitlab-shell/VERSION
index d139a7540..d139a7540 100644
--- a/ruby/vendor/gitlab-shell/VERSION
+++ b/ruby/gitlab-shell/VERSION
diff --git a/ruby/vendor/gitlab-shell/bin/authorized_keys b/ruby/gitlab-shell/bin/authorized_keys
index ca0164607..ca0164607 100755
--- a/ruby/vendor/gitlab-shell/bin/authorized_keys
+++ b/ruby/gitlab-shell/bin/authorized_keys
diff --git a/ruby/vendor/gitlab-shell/bin/check b/ruby/gitlab-shell/bin/check
index d2224a641..d2224a641 100755
--- a/ruby/vendor/gitlab-shell/bin/check
+++ b/ruby/gitlab-shell/bin/check
diff --git a/ruby/vendor/gitlab-shell/bin/compile b/ruby/gitlab-shell/bin/compile
index fc5fb6c65..fc5fb6c65 100755
--- a/ruby/vendor/gitlab-shell/bin/compile
+++ b/ruby/gitlab-shell/bin/compile
diff --git a/ruby/vendor/gitlab-shell/bin/create-hooks b/ruby/gitlab-shell/bin/create-hooks
index 1adc80984..1adc80984 100755
--- a/ruby/vendor/gitlab-shell/bin/create-hooks
+++ b/ruby/gitlab-shell/bin/create-hooks
diff --git a/ruby/vendor/gitlab-shell/bin/gitlab-keys b/ruby/gitlab-shell/bin/gitlab-keys
index 9eb19503e..9eb19503e 100755
--- a/ruby/vendor/gitlab-shell/bin/gitlab-keys
+++ b/ruby/gitlab-shell/bin/gitlab-keys
diff --git a/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-keys-check b/ruby/gitlab-shell/bin/gitlab-shell-authorized-keys-check
index 2ea1a7488..2ea1a7488 100755
--- a/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-keys-check
+++ b/ruby/gitlab-shell/bin/gitlab-shell-authorized-keys-check
diff --git a/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-principals-check b/ruby/gitlab-shell/bin/gitlab-shell-authorized-principals-check
index aa6d427c3..aa6d427c3 100755
--- a/ruby/vendor/gitlab-shell/bin/gitlab-shell-authorized-principals-check
+++ b/ruby/gitlab-shell/bin/gitlab-shell-authorized-principals-check
diff --git a/ruby/vendor/gitlab-shell/bin/gitlab-shell-ruby b/ruby/gitlab-shell/bin/gitlab-shell-ruby
index 8d43cf14a..8d43cf14a 100755
--- a/ruby/vendor/gitlab-shell/bin/gitlab-shell-ruby
+++ b/ruby/gitlab-shell/bin/gitlab-shell-ruby
diff --git a/ruby/vendor/gitlab-shell/bin/install b/ruby/gitlab-shell/bin/install
index e9c165458..e9c165458 100755
--- a/ruby/vendor/gitlab-shell/bin/install
+++ b/ruby/gitlab-shell/bin/install
diff --git a/ruby/vendor/gitlab-shell/bin/test-logger b/ruby/gitlab-shell/bin/test-logger
index 11b2a558a..11b2a558a 100755
--- a/ruby/vendor/gitlab-shell/bin/test-logger
+++ b/ruby/gitlab-shell/bin/test-logger
diff --git a/ruby/vendor/gitlab-shell/config.yml.example b/ruby/gitlab-shell/config.yml.example
index 4c356a759..4c356a759 100644
--- a/ruby/vendor/gitlab-shell/config.yml.example
+++ b/ruby/gitlab-shell/config.yml.example
diff --git a/ruby/vendor/gitlab-shell/hooks/post-receive b/ruby/gitlab-shell/hooks/post-receive
index 2b6538f03..2b6538f03 100755
--- a/ruby/vendor/gitlab-shell/hooks/post-receive
+++ b/ruby/gitlab-shell/hooks/post-receive
diff --git a/ruby/vendor/gitlab-shell/hooks/pre-receive b/ruby/gitlab-shell/hooks/pre-receive
index 6ce587951..6ce587951 100755
--- a/ruby/vendor/gitlab-shell/hooks/pre-receive
+++ b/ruby/gitlab-shell/hooks/pre-receive
diff --git a/ruby/vendor/gitlab-shell/hooks/update b/ruby/gitlab-shell/hooks/update
index 4c2fc08b0..4c2fc08b0 100755
--- a/ruby/vendor/gitlab-shell/hooks/update
+++ b/ruby/gitlab-shell/hooks/update
diff --git a/ruby/vendor/gitlab-shell/lib/action.rb b/ruby/gitlab-shell/lib/action.rb
index 28c1c146f..28c1c146f 100644
--- a/ruby/vendor/gitlab-shell/lib/action.rb
+++ b/ruby/gitlab-shell/lib/action.rb
diff --git a/ruby/vendor/gitlab-shell/lib/action/custom.rb b/ruby/gitlab-shell/lib/action/custom.rb
index a2f3d59c8..a2f3d59c8 100644
--- a/ruby/vendor/gitlab-shell/lib/action/custom.rb
+++ b/ruby/gitlab-shell/lib/action/custom.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_access.rb b/ruby/gitlab-shell/lib/gitlab_access.rb
index 72abd14d9..72abd14d9 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_access.rb
+++ b/ruby/gitlab-shell/lib/gitlab_access.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_access_status.rb b/ruby/gitlab-shell/lib/gitlab_access_status.rb
index dc577f4c4..dc577f4c4 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_access_status.rb
+++ b/ruby/gitlab-shell/lib/gitlab_access_status.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_config.rb b/ruby/gitlab-shell/lib/gitlab_config.rb
index 85aa88991..85aa88991 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_config.rb
+++ b/ruby/gitlab-shell/lib/gitlab_config.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_custom_hook.rb b/ruby/gitlab-shell/lib/gitlab_custom_hook.rb
index 67096dfe7..67096dfe7 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_custom_hook.rb
+++ b/ruby/gitlab-shell/lib/gitlab_custom_hook.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_init.rb b/ruby/gitlab-shell/lib/gitlab_init.rb
index 0e1458a7b..0e1458a7b 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_init.rb
+++ b/ruby/gitlab-shell/lib/gitlab_init.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_keys.rb b/ruby/gitlab-shell/lib/gitlab_keys.rb
index 0600a1877..0600a1877 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_keys.rb
+++ b/ruby/gitlab-shell/lib/gitlab_keys.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_lfs_authentication.rb b/ruby/gitlab-shell/lib/gitlab_lfs_authentication.rb
index 574dc98f1..574dc98f1 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_lfs_authentication.rb
+++ b/ruby/gitlab-shell/lib/gitlab_lfs_authentication.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_logger.rb b/ruby/gitlab-shell/lib/gitlab_logger.rb
index 67f6030dd..67f6030dd 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_logger.rb
+++ b/ruby/gitlab-shell/lib/gitlab_logger.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_metrics.rb b/ruby/gitlab-shell/lib/gitlab_metrics.rb
index 917a48918..917a48918 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_metrics.rb
+++ b/ruby/gitlab-shell/lib/gitlab_metrics.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_net.rb b/ruby/gitlab-shell/lib/gitlab_net.rb
index a84ba84ee..a84ba84ee 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_net.rb
+++ b/ruby/gitlab-shell/lib/gitlab_net.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_net/errors.rb b/ruby/gitlab-shell/lib/gitlab_net/errors.rb
index f32b3d826..f32b3d826 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_net/errors.rb
+++ b/ruby/gitlab-shell/lib/gitlab_net/errors.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_post_receive.rb b/ruby/gitlab-shell/lib/gitlab_post_receive.rb
index 7c5bd19c9..7c5bd19c9 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_post_receive.rb
+++ b/ruby/gitlab-shell/lib/gitlab_post_receive.rb
diff --git a/ruby/vendor/gitlab-shell/lib/gitlab_shell.rb b/ruby/gitlab-shell/lib/gitlab_shell.rb
index 2cb76a881..2cb76a881 100644
--- a/ruby/vendor/gitlab-shell/lib/gitlab_shell.rb
+++ b/ruby/gitlab-shell/lib/gitlab_shell.rb
diff --git a/ruby/vendor/gitlab-shell/lib/hooks_utils.rb b/ruby/gitlab-shell/lib/hooks_utils.rb
index b11317c8d..b11317c8d 100644
--- a/ruby/vendor/gitlab-shell/lib/hooks_utils.rb
+++ b/ruby/gitlab-shell/lib/hooks_utils.rb
diff --git a/ruby/vendor/gitlab-shell/lib/http_helper.rb b/ruby/gitlab-shell/lib/http_helper.rb
index c6a4bb845..c6a4bb845 100644
--- a/ruby/vendor/gitlab-shell/lib/http_helper.rb
+++ b/ruby/gitlab-shell/lib/http_helper.rb
diff --git a/ruby/vendor/gitlab-shell/lib/httpunix.rb b/ruby/gitlab-shell/lib/httpunix.rb
index 7d00f71d5..7d00f71d5 100644
--- a/ruby/vendor/gitlab-shell/lib/httpunix.rb
+++ b/ruby/gitlab-shell/lib/httpunix.rb
diff --git a/ruby/vendor/gitlab-shell/lib/object_dirs_helper.rb b/ruby/gitlab-shell/lib/object_dirs_helper.rb
index e175a0392..e175a0392 100644
--- a/ruby/vendor/gitlab-shell/lib/object_dirs_helper.rb
+++ b/ruby/gitlab-shell/lib/object_dirs_helper.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_access_spec.rb b/ruby/gitlab-shell/spec/gitlab_access_spec.rb
index 6c1d3485e..6c1d3485e 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_access_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_access_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_config_spec.rb b/ruby/gitlab-shell/spec/gitlab_config_spec.rb
index d12b657be..d12b657be 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_config_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_config_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_custom_hook_spec.rb b/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb
index 540cd2b0a..540cd2b0a 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_custom_hook_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_keys_spec.rb b/ruby/gitlab-shell/spec/gitlab_keys_spec.rb
index f86d00d06..f86d00d06 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_keys_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_keys_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb b/ruby/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb
index acc9e3dc3..acc9e3dc3 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_logger_spec.rb b/ruby/gitlab-shell/spec/gitlab_logger_spec.rb
index a9cd3fb0c..a9cd3fb0c 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_logger_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_logger_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_metrics_spec.rb b/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb
index 00e94b590..00e94b590 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_metrics_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_net_spec.rb b/ruby/gitlab-shell/spec/gitlab_net_spec.rb
index d7c46dc7e..d7c46dc7e 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_net_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_net_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_post_receive_spec.rb b/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
index d0618309c..d0618309c 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_post_receive_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb b/ruby/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb
index 705060470..705060470 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/gitlab_shell_spec.rb b/ruby/gitlab-shell/spec/gitlab_shell_spec.rb
index c261e6f90..c261e6f90 100644
--- a/ruby/vendor/gitlab-shell/spec/gitlab_shell_spec.rb
+++ b/ruby/gitlab-shell/spec/gitlab_shell_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/hooks_utils_spec.rb b/ruby/gitlab-shell/spec/hooks_utils_spec.rb
index 2113239a4..2113239a4 100644
--- a/ruby/vendor/gitlab-shell/spec/hooks_utils_spec.rb
+++ b/ruby/gitlab-shell/spec/hooks_utils_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/httpunix_spec.rb b/ruby/gitlab-shell/spec/httpunix_spec.rb
index 719a85594..719a85594 100644
--- a/ruby/vendor/gitlab-shell/spec/httpunix_spec.rb
+++ b/ruby/gitlab-shell/spec/httpunix_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/object_dirs_helper_spec.rb b/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb
index c2d0db7f7..c2d0db7f7 100644
--- a/ruby/vendor/gitlab-shell/spec/object_dirs_helper_spec.rb
+++ b/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb
diff --git a/ruby/vendor/gitlab-shell/spec/spec_helper.rb b/ruby/gitlab-shell/spec/spec_helper.rb
index be5ff9c6b..be5ff9c6b 100644
--- a/ruby/vendor/gitlab-shell/spec/spec_helper.rb
+++ b/ruby/gitlab-shell/spec/spec_helper.rb
diff --git a/ruby/vendor/gitlab-shell/spec/support/gitlab_shell_setup.rb b/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb
index eddd2d141..eddd2d141 100644
--- a/ruby/vendor/gitlab-shell/spec/support/gitlab_shell_setup.rb
+++ b/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb
diff --git a/ruby/vendor/gitlab-shell/spec/support/gl_id_test_hook b/ruby/gitlab-shell/spec/support/gl_id_test_hook
index bf5874da9..bf5874da9 100755
--- a/ruby/vendor/gitlab-shell/spec/support/gl_id_test_hook
+++ b/ruby/gitlab-shell/spec/support/gl_id_test_hook
diff --git a/ruby/vendor/gitlab-shell/spec/support/hook_fail b/ruby/gitlab-shell/spec/support/hook_fail
index 4420796f8..4420796f8 100755
--- a/ruby/vendor/gitlab-shell/spec/support/hook_fail
+++ b/ruby/gitlab-shell/spec/support/hook_fail
diff --git a/ruby/vendor/gitlab-shell/spec/support/hook_ok b/ruby/gitlab-shell/spec/support/hook_ok
index eb1e3bc7f..eb1e3bc7f 100755
--- a/ruby/vendor/gitlab-shell/spec/support/hook_ok
+++ b/ruby/gitlab-shell/spec/support/hook_ok
diff --git a/ruby/vendor/gitlab-shell/spec/support/http_unix_server.rb b/ruby/gitlab-shell/spec/support/http_unix_server.rb
index 113df57bc..113df57bc 100644
--- a/ruby/vendor/gitlab-shell/spec/support/http_unix_server.rb
+++ b/ruby/gitlab-shell/spec/support/http_unix_server.rb
diff --git a/ruby/vendor/gitlab-shell/spec/support/vcr.rb b/ruby/gitlab-shell/spec/support/vcr.rb
index a47cb9702..a47cb9702 100644
--- a/ruby/vendor/gitlab-shell/spec/support/vcr.rb
+++ b/ruby/gitlab-shell/spec/support/vcr.rb
diff --git a/ruby/vendor/gitlab-shell/spec/support/webmock.rb b/ruby/gitlab-shell/spec/support/webmock.rb
index ed4fe6d6a..ed4fe6d6a 100644
--- a/ruby/vendor/gitlab-shell/spec/support/webmock.rb
+++ b/ruby/gitlab-shell/spec/support/webmock.rb
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml
index d32431631..d32431631 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml
index 4adb08802..4adb08802 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml
index a84b7d2d7..a84b7d2d7 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml
index e531fcbbe..e531fcbbe 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml
index b2738fea7..b2738fea7 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml
index 34532cee2..34532cee2 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml
index f25fa7eaa..f25fa7eaa 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push.yml b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml
index 025614a99..025614a99 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/allowed-push.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml
index 8162343c2..8162343c2 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml
index a309c7ed3..a309c7ed3 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/check-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml
index f8ba853ee..f8ba853ee 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/check-ok.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml
index e50719ddf..e50719ddf 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml
index b60a93a6c..b60a93a6c 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml
index 3bfb39057..3bfb39057 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml
index 9d44a37d2..9d44a37d2 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml
index 9d44a37d2..9d44a37d2 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/discover-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/discover-ok.yml
index 0f17363eb..0f17363eb 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/discover-ok.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/discover-ok.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml b/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml
index 23ef3e53c..23ef3e53c 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml b/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml
index 676e5b8b4..676e5b8b4 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml b/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml
index e832c9067..e832c9067 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml b/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml
index e4fa33569..e4fa33569 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml b/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml
index 255f41516..255f41516 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml b/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml
index e89095d19..e89095d19 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive.yml b/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml
index c29f86539..c29f86539 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/post-receive.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml b/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml
index 5eed672c7..5eed672c7 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive.yml b/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml
index 6072d0ca0..6072d0ca0 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/pre-receive.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml
index fdff8fcbe..fdff8fcbe 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml
index c883dfaf4..c883dfaf4 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml
index 358f78800..358f78800 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml
index 55ce261b5..55ce261b5 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml
index d3341080f..d3341080f 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml
index e07249390..e07249390 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml
index 4a9305a6d..4a9305a6d 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml
index b461b5b24..b461b5b24 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml
index 5107d15e0..5107d15e0 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml
index c0617919f..c0617919f 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml
index 08dea914f..08dea914f 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml
index 46d9a1d0b..46d9a1d0b 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml
index 77248e2aa..77248e2aa 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml
index c16e608e0..c16e608e0 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml b/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
index ab9b55158..ab9b55158 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
diff --git a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml b/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml
index 20eba0bc0..20eba0bc0 100644
--- a/ruby/vendor/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml
+++ b/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml