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
56845280
Commit
56845280
authored
Aug 08, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unset BUNDLE_GEMFILE when installing Gitaly
parent
5b08d59f
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/tasks/gitlab/gitaly_rake_spec.rb
spec/tasks/gitlab/gitaly_rake_spec.rb
+1
-1
No files found.
lib/tasks/gitlab/gitaly.rake
View file @
56845280
...
@@ -21,7 +21,7 @@ namespace :gitlab do
...
@@ -21,7 +21,7 @@ namespace :gitlab do
create_gitaly_configuration
create_gitaly_configuration
# In CI we run scripts/gitaly-test-build instead of this command
# In CI we run scripts/gitaly-test-build instead of this command
unless
ENV
[
'CI'
].
present?
unless
ENV
[
'CI'
].
present?
Bundler
.
with_original_env
{
run_command!
(
%w[/usr/bin/env -u RUBYOPT]
+
[
command
])
}
Bundler
.
with_original_env
{
run_command!
(
%w[/usr/bin/env -u RUBYOPT
-u BUNDLE_GEMFILE
]
+
[
command
])
}
end
end
end
end
end
end
...
...
spec/tasks/gitlab/gitaly_rake_spec.rb
View file @
56845280
...
@@ -41,7 +41,7 @@ describe 'gitlab:gitaly namespace rake task' do
...
@@ -41,7 +41,7 @@ describe 'gitlab:gitaly namespace rake task' do
end
end
describe
'gmake/make'
do
describe
'gmake/make'
do
let
(
:command_preamble
)
{
%w[/usr/bin/env -u RUBYOPT]
}
let
(
:command_preamble
)
{
%w[/usr/bin/env -u RUBYOPT
-u BUNDLE_GEMFILE
]
}
before
(
:all
)
do
before
(
:all
)
do
@old_env_ci
=
ENV
.
delete
(
'CI'
)
@old_env_ci
=
ENV
.
delete
(
'CI'
)
...
...
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