From 178424735620f759a6d503aba8d7f8c528e64c18 Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Thu, 6 Mar 2025 17:15:03 +0200 Subject: [PATCH] MS-673 Use combined PR template --- ...feature_pr.md => PULL_REQUEST_TEMPLATE.md} | 17 ++++++----- .github/PULL_REQUEST_TEMPLATE/bugfix_pr.md | 29 ------------------- 2 files changed, 9 insertions(+), 37 deletions(-) rename .github/{PULL_REQUEST_TEMPLATE/feature_pr.md => PULL_REQUEST_TEMPLATE.md} (68%) delete mode 100644 .github/PULL_REQUEST_TEMPLATE/bugfix_pr.md diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_pr.md b/.github/PULL_REQUEST_TEMPLATE.md similarity index 68% rename from .github/PULL_REQUEST_TEMPLATE/feature_pr.md rename to .github/PULL_REQUEST_TEMPLATE.md index 102014ee5f..7a7cd5bace 100644 --- a/.github/PULL_REQUEST_TEMPLATE/feature_pr.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,20 +1,21 @@ ---- -name: Feature PR -about: Additions and improvements to SID - ---- - [JIRA ticket]() Will be released in: **version** +### Root cause analysis (for bugfixes only) + +First known affected version: **version** + +* Describe how the issue was found and what causes it +* Include images to better illustrate the issue + ### Notable changes * Describe the main changes in the PR with the reasons why they are required * Include images to better illustrate the changes -### Testing guidance (optional) +### Testing guidance -* Describe how the reviewers can try the new features out +* Describe how the reviewers can verify that issue is fixed ### Additional work checklist diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix_pr.md b/.github/PULL_REQUEST_TEMPLATE/bugfix_pr.md deleted file mode 100644 index 630b2a2ec4..0000000000 --- a/.github/PULL_REQUEST_TEMPLATE/bugfix_pr.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: Bugfix PR -about: Resolving issues in existing SID features - ---- - -[JIRA ticket]() -Will be released in: **version** -First known affected version: **version** - -### Root cause analysis - -* Describe how it was found and what caused the issue -* Include images to better illustrate the issue - -### Notable changes - -* Describe the changes in the PR and how they fix the root cause -* Include images or video to better illustrate the fix - -### Testing guidance - -* Describe how the reviewers can verify that issue is fixed - -### Additional work checklist - -* [ ] Effect on other features and security has been considered -* [ ] Test cases in Testiny are up to date (or ticket created) -* [ ] Other teams notified about the fix (if applicable)