summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-01-26 17:10:15 +0100
committerJacob Vosmaer <jacob@gitlab.com>2018-01-26 17:10:15 +0100
commitdc4ea21352b3f43bd019d071d1bc528829b3e237 (patch)
treea3f1e430dd0d5b10d164b2bfa9e03388e104a8d4
parent9dcf8137e5664951247da1652dd66d068618f4da (diff)
downloadgitlab-ce-gitlab-git-spawn-env.tar.gz
Move flatten.compactgitlab-git-spawn-env
-rw-r--r--lib/gitlab/git/repository.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 2a58d591600..9c09ff18d0e 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1678,10 +1678,7 @@ module Gitlab
if relative_paths.any?
relative_paths.map { |d| File.join(path, d) }
else
- absolute_object_directories
- .flatten
- .compact
- .flat_map { |d| d.split(File::PATH_SEPARATOR) }
+ absolute_object_directories.flat_map { |d| d.split(File::PATH_SEPARATOR) }
end
end
@@ -1690,7 +1687,7 @@ module Gitlab
end
def absolute_object_directories
- Gitlab::Git::Env.all.values_at(*ALLOWED_OBJECT_DIRECTORIES_VARIABLES)
+ Gitlab::Git::Env.all.values_at(*ALLOWED_OBJECT_DIRECTORIES_VARIABLES).flatten.compact
end
# Get the content of a blob for a given commit. If the blob is a commit