diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 15:07:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 15:07:32 +0000 |
| commit | db19df23733c768c564534a09de2e6718097ec95 (patch) | |
| tree | f148eb0723f20a2442e0274089d567e1810ee8d2 /.gitlab | |
| parent | d2199d74936cd5cb9f45f569f723a5370ae5013e (diff) | |
| download | gitlab-ce-db19df23733c768c564534a09de2e6718097ec95.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Refactoring.md | 5 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Pipeline Configuration.md | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab/issue_templates/Refactoring.md b/.gitlab/issue_templates/Refactoring.md index df18dcf7656..453ae743237 100644 --- a/.gitlab/issue_templates/Refactoring.md +++ b/.gitlab/issue_templates/Refactoring.md @@ -42,8 +42,9 @@ please list them here. Please select the appropriate label from the following: ~"feature::addition" ~"type::maintenance" - ~"tooling::pipelines" - ~"tooling::workflow" + ~"maintenance::refactor" + ~"maintenance::pipelines" + ~"maintenance::workflow" --> /label ~"type::maintenance" diff --git a/.gitlab/merge_request_templates/Pipeline Configuration.md b/.gitlab/merge_request_templates/Pipeline Configuration.md index a0b8d1cb8e4..336988d8bdf 100644 --- a/.gitlab/merge_request_templates/Pipeline Configuration.md +++ b/.gitlab/merge_request_templates/Pipeline Configuration.md @@ -35,4 +35,4 @@ This will help keep track of expected cost increases to the [GitLab project aver - [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes) -/label ~"type::tooling" ~"tooling::pipelines" ~"Engineering Productivity" +/label ~"maintenance::pipelines" ~"Engineering Productivity" |