Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a24abf39
Commit
a24abf39
authored
Oct 12, 2017
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the format of rugged alternate directory list
Fixes #39046
parent
4378f56c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+1
-0
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+2
-2
No files found.
lib/gitlab/git/repository.rb
View file @
a24abf39
...
@@ -1230,6 +1230,7 @@ module Gitlab
...
@@ -1230,6 +1230,7 @@ module Gitlab
relative_paths
.
map
{
|
d
|
File
.
join
(
path
,
d
)
}
relative_paths
.
map
{
|
d
|
File
.
join
(
path
,
d
)
}
else
else
Gitlab
::
Git
::
Env
.
all
.
values_at
(
*
ALLOWED_OBJECT_DIRECTORIES_VARIABLES
)
Gitlab
::
Git
::
Env
.
all
.
values_at
(
*
ALLOWED_OBJECT_DIRECTORIES_VARIABLES
)
.
flatten
.
compact
.
compact
.
flat_map
{
|
d
|
d
.
split
(
File
::
PATH_SEPARATOR
)
}
.
flat_map
{
|
d
|
d
.
split
(
File
::
PATH_SEPARATOR
)
}
end
end
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
a24abf39
...
@@ -87,7 +87,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -87,7 +87,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
'GIT_OBJECT_DIRECTORY_RELATIVE'
=>
'./objects/foo'
,
'GIT_OBJECT_DIRECTORY_RELATIVE'
=>
'./objects/foo'
,
'GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE'
=>
[
'./objects/bar'
,
'./objects/baz'
],
'GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE'
=>
[
'./objects/bar'
,
'./objects/baz'
],
'GIT_OBJECT_DIRECTORY'
=>
'ignored'
,
'GIT_OBJECT_DIRECTORY'
=>
'ignored'
,
'GIT_ALTERNATE_OBJECT_DIRECTORIES'
=>
'ignored:ignored'
,
'GIT_ALTERNATE_OBJECT_DIRECTORIES'
=>
%w[ignored ignored]
,
'GIT_OTHER'
=>
'another_env'
'GIT_OTHER'
=>
'another_env'
})
})
end
end
...
@@ -104,7 +104,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -104,7 +104,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
before
do
before
do
allow
(
Gitlab
::
Git
::
Env
).
to
receive
(
:all
).
and_return
({
allow
(
Gitlab
::
Git
::
Env
).
to
receive
(
:all
).
and_return
({
'GIT_OBJECT_DIRECTORY'
=>
'foo'
,
'GIT_OBJECT_DIRECTORY'
=>
'foo'
,
'GIT_ALTERNATE_OBJECT_DIRECTORIES'
=>
'bar:baz'
,
'GIT_ALTERNATE_OBJECT_DIRECTORIES'
=>
%w[bar baz]
,
'GIT_OTHER'
=>
'another_env'
'GIT_OTHER'
=>
'another_env'
})
})
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment