diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-10-05 16:51:31 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-10-11 15:46:55 +0200 |
| commit | 4378f56c7b1f6f6031c284ff8879cdc4ad79468f (patch) | |
| tree | 51e29561e9262dead632801038764249bc922bcd /lib/gitlab/git/env.rb | |
| parent | 143ace07ad8c81e5de6f3fd926db7547e7288860 (diff) | |
| download | gitlab-ce-4378f56c7b1f6f6031c284ff8879cdc4ad79468f.tar.gz | |
Pass git object dir attributes as relative paths to Gitaly
Fixes gitaly#629
Diffstat (limited to 'lib/gitlab/git/env.rb')
| -rw-r--r-- | lib/gitlab/git/env.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/git/env.rb b/lib/gitlab/git/env.rb index f80193ac553..80f0731cd99 100644 --- a/lib/gitlab/git/env.rb +++ b/lib/gitlab/git/env.rb @@ -11,9 +11,11 @@ module Gitlab # # This class is thread-safe via RequestStore. class Env - WHITELISTED_GIT_VARIABLES = %w[ + WHITELISTED_VARIABLES = %w[ GIT_OBJECT_DIRECTORY + GIT_OBJECT_DIRECTORY_RELATIVE GIT_ALTERNATE_OBJECT_DIRECTORIES + GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE ].freeze def self.set(env) @@ -33,7 +35,7 @@ module Gitlab end def self.whitelist_git_env(env) - env.select { |key, _| WHITELISTED_GIT_VARIABLES.include?(key.to_s) }.with_indifferent_access + env.select { |key, _| WHITELISTED_VARIABLES.include?(key.to_s) }.with_indifferent_access end end end |