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
74d6ff79
Commit
74d6ff79
authored
Jan 17, 2022
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'update-bundler' into 'master'"
This reverts merge request !78298
parent
ada615e7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
6 deletions
+4
-6
Gemfile.lock
Gemfile.lock
+1
-1
qa/Dockerfile
qa/Dockerfile
+0
-1
qa/Gemfile.lock
qa/Gemfile.lock
+1
-1
scripts/utils.sh
scripts/utils.sh
+0
-1
spec/commands/metrics_server/metrics_server_spec.rb
spec/commands/metrics_server/metrics_server_spec.rb
+2
-2
No files found.
Gemfile.lock
View file @
74d6ff79
...
...
@@ -1673,4 +1673,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1)
BUNDLED WITH
2.
3.5
2.
1.4
qa/Dockerfile
View file @
74d6ff79
...
...
@@ -63,7 +63,6 @@ WORKDIR /home/gitlab/qa
# Install qa dependencies or fetch from cache if unchanged
COPY
./qa/Gemfile* /home/gitlab/qa/
RUN
gem
install
bundler
--no-document
--conservative
--version
2.3.5
RUN
bundle
install
--jobs
=
$(
nproc
)
--retry
=
3
--without
=
development
--quiet
##
...
...
qa/Gemfile.lock
View file @
74d6ff79
...
...
@@ -355,4 +355,4 @@ DEPENDENCIES
zeitwerk (~> 2.4)
BUNDLED WITH
2.
3.5
2.
2.33
scripts/utils.sh
View file @
74d6ff79
...
...
@@ -36,7 +36,6 @@ function bundle_install_script() {
exit
1
;
fi
;
gem
install
bundler
--no-document
--conservative
--version
2.3.5
bundle
--version
bundle config
set
path
"
$(
pwd
)
/vendor"
bundle config
set
clean
'true'
...
...
spec/commands/metrics_server/metrics_server_spec.rb
View file @
74d6ff79
...
...
@@ -47,7 +47,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
if
@pid
pgrp
=
Process
.
getpgid
(
@pid
)
Timeout
.
timeout
(
10
)
do
Timeout
.
timeout
(
5
)
do
Process
.
kill
(
'TERM'
,
-
pgrp
)
Process
.
waitpid
(
@pid
)
end
...
...
@@ -63,7 +63,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
it
'serves /metrics endpoint'
do
expect
do
Timeout
.
timeout
(
10
)
do
Timeout
.
timeout
(
5
)
do
http_ok
=
false
until
http_ok
sleep
1
...
...
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