diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:08:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:08:55 +0300 |
commit | 2dedd78ef505a0ab0a379c7340a3fcba56ada663 (patch) | |
tree | ef05626056122d4e07145c9c043484764f1267e8 /.gitlab/ci | |
parent | f931527bc5120097db15737f8594a431bcad9116 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index af0861dd8b3..459afc7c31c 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -448,7 +448,9 @@ db:backup_and_restore: - date - bundle exec rake gitlab:backup:restore rules: - - changes: ["lib/backup/**/*"] + - changes: + - "lib/backup/**/*" + - "lib/tasks/gitlab/backup.rake" rspec:deprecations: extends: diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 4e635ef5984..c22b468d674 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -46,7 +46,7 @@ review-build-cng: variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" - GITLAB_HELM_CHART_REF: "v4.12.0" + GITLAB_HELM_CHART_REF: "v5.1.0" environment: name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} |