Merge branch 'revert-2eb25004' into 'master'

Revert "Merge branch 'sh-use-absolute-paths-gitaly-tests' into 'master'"

See merge request gitlab-org/gitlab!53261

lib/gitlab/setup_helper.rb

@@ -121,7 +121,7 @@ module Gitlab
 
           config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
-          config[:bin_dir] = File.expand_path(Gitlab.config.gitaly.client_path)
+          config[:bin_dir] = Gitlab.config.gitaly.client_path
           config[:gitlab] = { url: Gitlab.config.gitlab.url }
           config[:logging] = { dir: Rails.root.join('log').to_s }
 

spec/support/helpers/test_env.rb

@@ -184,7 +184,7 @@ module TestEnv
   end
 
   def gitaly_dir
-    File.dirname(File.expand_path(gitaly_socket_path))
+    File.dirname(gitaly_socket_path)
   end
 
   def start_gitaly(gitaly_dir)