Skip to content

Commit 42c79aa

Browse files
Robert MarshallClemens Beckdependencies-bot
committed
Merge branch 'deps/4225d27-b2ed4f7' into 'master'
Update rubygems/rubygems from 3.5.7 to 3.5.9 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7541 Merged-by: Robert Marshall <[email protected]> Approved-by: Jon Doveston <[email protected]> Approved-by: Robert Marshall <[email protected]> Co-authored-by: Clemens Beck <[email protected]> Co-authored-by: deps <[email protected]>
2 parents afa4d72 + acc5d2b commit 42c79aa

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ variables:
5757
CACHE_EDITION: "CE"
5858
CACHE_POLICY: 'pull-push'
5959
ISSUE_BOT_LABELS_EXTRA: "group::distribution"
60-
BUNDLER_VERSION: "2.5.7"
60+
BUNDLER_VERSION: "2.5.9"
6161
# NOTE: When `NEXT_RUBY_VERSION` is updated, flip
6262
# `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises.
6363
NEXT_RUBY_VERSION: "3.1.4"

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,4 +649,4 @@ DEPENDENCIES
649649
yard
650650

651651
BUNDLED WITH
652-
2.5.5
652+
2.5.9

config/software/rubygems.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616

1717
name 'rubygems'
18-
default_version '3.5.7'
18+
default_version '3.5.9'
1919

2020
license 'MIT'
2121
license_file 'LICENSE.txt'

test-plans/upgrade-rubygems-testplan.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
- [ ] Checked rubygems [changelog](https://github.com/rubygems/rubygems/blob/master/CHANGELOG.md) for potential breaking changes.
77
- [ ] Checked that the `bundler` gem was updated to the corresponding version
88
noted in the changelog.
9+
- [ ] Checked that the `BUNDLED_WITH` version in the `Gemfile.lock` was updated
10+
to the corresponding version noted in the changelog.
911
- [ ] Performed a successful GitLab Enterprise Edition (EE) build on gitlab.com
1012
on all supported platforms (include `build-package-on-all-os` job).
1113
- [ ] Ran `qa-subset-test` as well as manual `qa-remaining-test-manual` CI/CD

0 commit comments

Comments
 (0)