diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 21:07:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 21:07:33 +0300 |
commit | 9e5484cee690f8bb2c1796013345d8cbc1872d77 (patch) | |
tree | 7b5c95c7de5eaba5ebb053da65c83184af1cf74c /.gitlab | |
parent | 638e2f1c5f55988135da63c7aa57bcecb9355a2b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/CODEOWNERS | 4 | ||||
-rw-r--r-- | .gitlab/ci/qa-common/main.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/merge_request_templates/Deprecations.md | 2 | ||||
-rw-r--r-- | .gitlab/merge_request_templates/Removals.md | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 5b15ea2c4d8..7a020838c22 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -653,7 +653,7 @@ lib/gitlab/checks/** /doc/architecture/blueprints/database/scalability/patterns/ @aqualls /doc/architecture/blueprints/database_scaling/ @aqualls /doc/ci/ @marcel.amirault -/doc/ci/chatops/ @eread @ashrafkhamis +/doc/ci/chatops/ @phillipwells /doc/ci/cloud_deployment/ @phillipwells /doc/ci/docker/using_docker_images.md @fneill /doc/ci/environments/ @phillipwells @@ -676,7 +676,7 @@ lib/gitlab/checks/** /doc/development/bulk_import.md @eread @ashrafkhamis /doc/development/cached_queries.md @jglassman1 /doc/development/cascading_settings.md @jglassman1 -/doc/development/chatops_on_gitlabcom.md @eread @ashrafkhamis +/doc/development/chatops_on_gitlabcom.md @phillipwells /doc/development/cicd/ @marcel.amirault /doc/development/code_intelligence/ @aqualls /doc/development/code_owners/ @aqualls @msedlakjakubowski diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index 8b904afd495..3b6f42ba57e 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -6,7 +6,7 @@ workflow: include: - project: gitlab-org/quality/pipeline-common - ref: 7.2.1 + ref: 7.2.3 file: - /ci/base.gitlab-ci.yml - /ci/allure-report.yml diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md index 9e02e047efa..fa53b9c800a 100644 --- a/.gitlab/merge_request_templates/Deprecations.md +++ b/.gitlab/merge_request_templates/Deprecations.md @@ -71,8 +71,6 @@ yourself as a reviewer if it's not ready for merge yet. - [ ] Title: - Length limit: 7 words (not including articles or prepositions). - Capitalization: ensure the title is [sentence cased](https://design.gitlab.com/content/punctuation#case). -- [ ] Dates: - - Make sure that the milestone dates are based on the dates in [Product milestone creation](https://about.gitlab.com/handbook/product/milestones/#product-milestone-creation). - [ ] Consistency: - Ensure that all resources (docs, deprecation, etc.) refer to the feature with the same term / feature name. - [ ] Content: diff --git a/.gitlab/merge_request_templates/Removals.md b/.gitlab/merge_request_templates/Removals.md index 39b99c00314..4a9efcf364d 100644 --- a/.gitlab/merge_request_templates/Removals.md +++ b/.gitlab/merge_request_templates/Removals.md @@ -78,8 +78,6 @@ yourself as a reviewer if it's not yet ready for merge. - [ ] Title: - Length limit: 7 words (not including articles or prepositions). - Capitalization: ensure the title is [sentence cased](https://design.gitlab.com/content/punctuation#case). -- [ ] Dates: - - Make sure that the milestone dates are based on the dates in [Product milestone creation](https://about.gitlab.com/handbook/product/milestones/#product-milestone-creation). - [ ] Consistency: - Ensure that all resources (docs, removal, etc.) refer to the feature with the same term / feature name. - [ ] Content: |