diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-06 15:10:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-06 15:10:05 +0000 |
| commit | 07e0fae35c51cff088d6b2cbc6d844f421e16617 (patch) | |
| tree | d0da7fe202abac1b1919673d1b40bb4597da8dac /.gitlab | |
| parent | 14b5bf2629cf6cd77fe9bb6108d4a6dc0963f6c1 (diff) | |
| download | gitlab-ce-07e0fae35c51cff088d6b2cbc6d844f421e16617.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 459afc7c31c..f4b001ed1ba 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -393,8 +393,7 @@ db:migrate-from-previous-major-version: - 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.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 update --bundler google-protobuf nokogiri grpc mimemagic bootsnap" - SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh - run_timed_command "bundle exec rake db:drop db:create db:structure:load db:migrate db:seed_fu" - git checkout -f $CI_COMMIT_SHA |