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
1631ad02
Commit
1631ad02
authored
Jul 27, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support the fact that Gitaly uses bundler
parent
0ed42f4b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/tasks/gitlab/gitaly.rake
lib/tasks/gitlab/gitaly.rake
+1
-1
spec/support/test_env.rb
spec/support/test_env.rb
+1
-1
No files found.
lib/tasks/gitlab/gitaly.rake
View file @
1631ad02
...
@@ -19,7 +19,7 @@ namespace :gitlab do
...
@@ -19,7 +19,7 @@ namespace :gitlab do
Dir
.
chdir
(
args
.
dir
)
do
Dir
.
chdir
(
args
.
dir
)
do
create_gitaly_configuration
create_gitaly_configuration
run_command!
([
command
])
Bundler
.
with_original_env
{
run_command!
([
command
])
}
end
end
end
end
...
...
spec/support/test_env.rb
View file @
1631ad02
...
@@ -146,7 +146,7 @@ module TestEnv
...
@@ -146,7 +146,7 @@ module TestEnv
gitaly_exec
=
File
.
join
(
gitaly_dir
,
'gitaly'
)
gitaly_exec
=
File
.
join
(
gitaly_dir
,
'gitaly'
)
gitaly_config
=
File
.
join
(
gitaly_dir
,
'config.toml'
)
gitaly_config
=
File
.
join
(
gitaly_dir
,
'config.toml'
)
log_file
=
Rails
.
root
.
join
(
'log/gitaly-test.log'
).
to_s
log_file
=
Rails
.
root
.
join
(
'log/gitaly-test.log'
).
to_s
@gitaly_pid
=
spawn
(
gitaly_exec
,
gitaly_config
,
[
:out
,
:err
]
=>
log_file
)
@gitaly_pid
=
Bundler
.
with_original_env
{
spawn
(
gitaly_exec
,
gitaly_config
,
[
:out
,
:err
]
=>
log_file
)
}
end
end
def
stop_gitaly
def
stop_gitaly
...
...
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