From 7f2513864b27308132d0129e016fa3a7c245a879 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 14 Sep 2024 01:50:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@17-3-stable-ee --- gems/gem.gitlab-ci.yml | 1 + gems/gitlab-backup-cli/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gems/gem.gitlab-ci.yml b/gems/gem.gitlab-ci.yml index eb987b8e627..4bfd012aec6 100644 --- a/gems/gem.gitlab-ci.yml +++ b/gems/gem.gitlab-ci.yml @@ -47,6 +47,7 @@ default: before_script: - cd $[[inputs.gem_path_prefix]]$[[inputs.gem_name]] - ruby -v # Print out ruby version for debugging + - gem update --system - bundle_version=$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1 | sed -e 's/[[:space:]]//') - gem install bundler --version "$bundle_version" --no-document # Bundler is not installed with the image - bundle config # Show bundler configuration diff --git a/gems/gitlab-backup-cli/Gemfile.lock b/gems/gitlab-backup-cli/Gemfile.lock index 90493f4e4f6..2e806e947b8 100644 --- a/gems/gitlab-backup-cli/Gemfile.lock +++ b/gems/gitlab-backup-cli/Gemfile.lock @@ -186,4 +186,4 @@ DEPENDENCIES rubocop-rails (<= 2.20) BUNDLED WITH - 2.5.7 + 2.5.18