Skip to content
Snippets Groups Projects
Commit 3ebdc751 authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Merge branch 'feature-branches-ruby-3-2' into 'master'

parents b9b6e188 b905a5cf
No related branches found
No related tags found
1 merge request!145Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -58,9 +58,6 @@
CACHE_POLICY: 'pull-push'
ISSUE_BOT_LABELS_EXTRA: "group::distribution"
BUNDLER_VERSION: "2.5.9"
# NOTE: When `NEXT_RUBY_VERSION` is updated, flip
# `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises.
NEXT_RUBY_VERSION: "3.1.4"
GET_GEO_TAG: "0.7.4"
CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab'
SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab'
......
......@@ -28,7 +28,7 @@
# NOTE: When this value is updated, flip `USE_NEXT_RUBY_VERSION_IN_*` variable
# to false to avoid surprises.
next_ruby_version = Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.1.5'
next_ruby_version = Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.2.4'
# MRs targeting stable branches should use current Ruby version and ignore next
# Ruby version. Also, we provide `USE_SPECIFIED_RUBY_VERSION` variable to force
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment