diff --git a/.github/PULL_REQUEST_TEMPLATE/upgrade.md b/.github/PULL_REQUEST_TEMPLATE/upgrade.md index 093576986..117b82d28 100644 --- a/.github/PULL_REQUEST_TEMPLATE/upgrade.md +++ b/.github/PULL_REQUEST_TEMPLATE/upgrade.md @@ -85,6 +85,7 @@ Connected issue: #0000 - [ ] Added PR # reference to merge commit title - [ ] Collected commit title tags in merge commit title but excluded any `p` tags - [ ] Moved connected issue to *Merged lower* column in ZenHub +- [ ] Moved blocked issues to *Triage* or no issues are blocked on the connected issue - [ ] Closed related Dependabot PRs with a comment referencing the corresponding commit in this PR or this PR does not include any such commits - [ ] Pushed merge commit to GitHub diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index cb969d568..e60c198d3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -144,6 +144,7 @@ title is `Fix: ` followed by the issue title - [ ] Added PR # reference to merge commit title - [ ] Collected commit title tags in merge commit title but only included `p` if the PR is also labeled `partial` - [ ] Moved connected issues to *Merged lower* column in ZenHub +- [ ] Moved blocked issues to *Triage* or no issues are blocked on the connected issues - [ ] Pushed merge commit to GitHub diff --git a/.github/pull_request_template.md.template.py b/.github/pull_request_template.md.template.py index dffa59fe5..61a2d9ac9 100644 --- a/.github/pull_request_template.md.template.py +++ b/.github/pull_request_template.md.template.py @@ -812,6 +812,11 @@ def emit(t: T, target_branch: str): 'Moved connected issue to *Merged stable* column in ZenHub', f'Moved connected {t.issues} to *Merged lower* column in ZenHub') }), + iif(target_branch == 'develop' and t is not T.backport, { + 'type': 'cli', + 'content': 'Moved blocked issues to *Triage*', + 'alt': f'or no issues are blocked on the connected {t.issues}' + }), iif(t is T.upgrade, { 'type': 'cli',