Merge branch 'sh-simplify-gitaly-require' into 'master'

Simplify loading of required Ruby files

See merge request gitlab-org/gitaly!1942

2 files changed, 7 insertions, 6 deletions

diff --git a/changelogs/unreleased/sh-simplify-gitaly-require.yml b/changelogs/unreleased/sh-simplify-gitaly-require.yml
new file mode 100644
index 000000000..f39db091c
--- /dev/null
+++ b/changelogs/unreleased/sh-simplify-gitaly-require.yml
@@ -0,0 +1,5 @@
+---
+title: Simplify loading of required Ruby files
+merge_request: 1942
+author:
+type: other
diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb
index b0e87ff75..ed09fb894 100644
--- a/ruby/lib/gitlab/git.rb
+++ b/ruby/lib/gitlab/git.rb
@@ -16,11 +16,7 @@ require_relative 'rails_logger.rb'
 require_relative 'gollum.rb'
 require_relative 'config.rb'
 
-# `Dir.glob` will make a readdir() system call to extract the canonical
-# name of the directory. This will ensure we avoid errors with
-# substitutions below on case-sensitive filesystems such as Apple File
-# System.
-dir = Dir[__dir__].first
+dir = __dir__
 
 # Some later requires are order-sensitive. Manually require whatever we need.
 require_relative "#{dir}/encoding_helper.rb"
@@ -32,7 +28,7 @@ require_relative "#{dir}/git/repository_mirroring.rb"
 
 # Require all .rb files we can find in the gitlab lib directory
 Dir["#{dir}/**/*.rb"].sort.each do |ruby_file|
-  require_relative ruby_file.sub(dir, '').sub(%r{^/*}, '')
+  require File.expand_path(ruby_file)
 end
 
 class String