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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
dc6e7380
Commit
dc6e7380
authored
Feb 03, 2021
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'sh-use-absolute-paths-gitaly-tests' into 'master'"
This reverts merge request !53174
parent
97c2def3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/setup_helper.rb
lib/gitlab/setup_helper.rb
+1
-1
spec/support/helpers/test_env.rb
spec/support/helpers/test_env.rb
+1
-1
No files found.
lib/gitlab/setup_helper.rb
View file @
dc6e7380
...
@@ -121,7 +121,7 @@ module Gitlab
...
@@ -121,7 +121,7 @@ module Gitlab
config
[
:'gitaly-ruby'
]
=
{
dir:
File
.
join
(
gitaly_dir
,
'ruby'
)
}
if
gitaly_ruby
config
[
:'gitaly-ruby'
]
=
{
dir:
File
.
join
(
gitaly_dir
,
'ruby'
)
}
if
gitaly_ruby
config
[
:'gitlab-shell'
]
=
{
dir:
Gitlab
.
config
.
gitlab_shell
.
path
}
config
[
:'gitlab-shell'
]
=
{
dir:
Gitlab
.
config
.
gitlab_shell
.
path
}
config
[
:bin_dir
]
=
File
.
expand_path
(
Gitlab
.
config
.
gitaly
.
client_path
)
config
[
:bin_dir
]
=
Gitlab
.
config
.
gitaly
.
client_path
config
[
:gitlab
]
=
{
url:
Gitlab
.
config
.
gitlab
.
url
}
config
[
:gitlab
]
=
{
url:
Gitlab
.
config
.
gitlab
.
url
}
config
[
:logging
]
=
{
dir:
Rails
.
root
.
join
(
'log'
).
to_s
}
config
[
:logging
]
=
{
dir:
Rails
.
root
.
join
(
'log'
).
to_s
}
...
...
spec/support/helpers/test_env.rb
View file @
dc6e7380
...
@@ -184,7 +184,7 @@ module TestEnv
...
@@ -184,7 +184,7 @@ module TestEnv
end
end
def
gitaly_dir
def
gitaly_dir
File
.
dirname
(
File
.
expand_path
(
gitaly_socket_path
)
)
File
.
dirname
(
gitaly_socket_path
)
end
end
def
start_gitaly
(
gitaly_dir
)
def
start_gitaly
(
gitaly_dir
)
...
...
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