From dc4ea21352b3f43bd019d071d1bc528829b3e237 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 26 Jan 2018 17:10:15 +0100 Subject: Move flatten.compact --- lib/gitlab/git/repository.rb | 7 ++----- 1 file 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 -- cgit v1.2.1