diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-08-06 20:19:16 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-06 20:19:16 +0300 |
| commit | 5a342e2745ce88bef95ccae8255a2b09477f6743 (patch) | |
| tree | 75bc7248a575aa807db8685032a2d2d7dc14b88e | |
| parent | 6d2261914e04ed5b858d2a24d2ea98ef788f05b4 (diff) | |
| parent | 02cc6f6258a691384dff170a40e4ddcddd6da29f (diff) | |
Merge branch '11-11-stable-fix-migration-paths' into '11-11-stable'
Fix migration-paths job for 11-11
See merge request gitlab-org/gitlab-ce!31475
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 35c5f67427e..204573d5618 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -105,7 +105,7 @@ variables: SETUP_DB: "false" script: - - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0 + - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v11.5.0 - git checkout -f FETCH_HEAD - sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile - bundle update google-protobuf grpc @@ -113,6 +113,7 @@ - date - cp config/gitlab.yml.example config/gitlab.yml - bundle exec rake db:drop db:create db:schema:load db:seed_fu + - bundle exec rake add_limits_mysql - date - git checkout -f $CI_COMMIT_SHA - bundle install $BUNDLE_INSTALL_FLAGS |