From eb723c96f11c82c865ca2e6a8da92996934f4d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R?= Date: Fri, 16 Feb 2018 17:55:39 +0100 Subject: [PATCH] [Github] Clarify template a bit more in regards to improvements (#2251) * [Github] Clarify template a bit more in regards to improvments Unsure how to specify it in short amount on space, but the template should: 1. specify features goes to master 2. mention improvements can optionally be backported, when they are smaller things to improve overall use, typically to unlock usage of existing features. For instance something not correctly implemented but documented/specified. Main goal here is avoid confusion, as we happen to also have notation of improvements in JIRA which falls between bug and feature. * Typos * shorten text to avoid line break --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ead4680670c..ae2fc154cd5 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,9 +1,9 @@ | Question | Answer | ------------------ | ------------------ | **JIRA issue** | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX) -| **Bug fix** | yes/no +| **Bug/Improvement**| yes/no | **New feature** | yes/no -| **Target version** | `6.7`/`6.13` for bug fixes, `7.x` for features +| **Target version** | `6.x`/`7.x` for bug fixes or improvements _(on existing features)_, `master` for features | **BC breaks** | yes/no | **Tests pass** | yes/no | **Doc needed** | yes/no