diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 15:13:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 15:13:09 +0300 |
| commit | ee2024d964d1742a8ec01da89e0b34351c9303ab (patch) | |
| tree | 7c8108788f3db88c579974951bb2cb1b792e871e /.gitlab | |
| parent | 5f6fe673fa797f46ee747df4553a9c216224bb85 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/database.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Revert To Resolve Incident.md | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/database.gitlab-ci.yml b/.gitlab/ci/database.gitlab-ci.yml index 6ca8a9bbc36..b01ba247ce7 100644 --- a/.gitlab/ci/database.gitlab-ci.yml +++ b/.gitlab/ci/database.gitlab-ci.yml @@ -36,7 +36,7 @@ db:rollback: - .db-job-base - .rails:rules:db-rollback script: - - bundle exec rake db:migrate VERSION=20220126191624 # 15.4 + - bundle exec rake db:migrate VERSION=20221111123146 # 15.7 - bundle exec rake db:migrate db:rollback single-db: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index dc00aa1fe54..165c2159bdf 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -912,6 +912,7 @@ variables: ARCH: amd64,arm64 - <<: *if-ruby3_1-branch + - !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only-setup-test-env-patterns", rules] .build-images:rules:build-qa-image-as-if-foss: rules: diff --git a/.gitlab/merge_request_templates/Revert To Resolve Incident.md b/.gitlab/merge_request_templates/Revert To Resolve Incident.md index c1980d70768..9f8c42ac67c 100644 --- a/.gitlab/merge_request_templates/Revert To Resolve Incident.md +++ b/.gitlab/merge_request_templates/Revert To Resolve Incident.md @@ -23,7 +23,7 @@ ### Related issues and merge requests -/label ~"pipeline:expedite" ~"master:broken" +/label ~"pipeline:expedite" ~"master:broken" ~"Pick into auto-deploy" ~"severity::1" ~"priority::1" <!-- Regression label: if applicable, specify the milestone-specific regression label |