diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 14:47:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 14:47:00 +0000 |
| commit | 08086ff522742c28a6b10e9b2ed71f0af6633e5b (patch) | |
| tree | 5a4fde8b23140cb4edf04b24854b53f87085dd42 /.gitlab | |
| parent | 8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (diff) | |
| download | gitlab-ce-08086ff522742c28a6b10e9b2ed71f0af6633e5b.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 5cd64baf4d3..68804b0f4c1 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -344,7 +344,7 @@ db:migrate-from-previous-major-version: - sed -i -e "s/gem 'grpc', '~> 1.24.0'/gem 'grpc', '~> 1.30.2'/" Gemfile # Update gRPC for Ruby 2.7 - sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12'/" Gemfile - sed -i -e "s/gem 'nokogiri', '~> 1.10.5'/gem 'nokogiri', '~> 1.11.0'/" Gemfile - - sed -i -e "s/gem 'mimemagic', '~> 0.3.2'/gem 'ruby-magic', '~> 0.3.2'/" Gemfile + - sed -i -e "s/gem 'mimemagic', '~> 0.3.2'/gem 'ruby-magic', '~> 0.4.0'/" Gemfile - run_timed_command "gem install bundler:1.17.3" - run_timed_command "bundle update google-protobuf nokogiri grpc mimemagic bootsnap" - run_timed_command "bundle install ${BUNDLE_INSTALL_FLAGS}" |