Skip to content

Commit

Permalink
Update PR template with new branching strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisameling authored Jul 9, 2020
1 parent 010bc06 commit 1b03924
Showing 1 changed file with 32 additions and 28 deletions.
60 changes: 32 additions & 28 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
[//]: # ( Please be sure you are submitting this against the staging branch.)
[//]: # ( Any PR related to Mautic 2 issues are not relavant any more, please consider upgrading your code to the Mautic 3 series (staging branch).)
[//]: # ( Please answer the following questions: )
<!--
Any PR related to Mautic 2 issues is not relavant anymore, please consider upgrading your code to the Mautic 3 series (staging/3.0 branch).
-->
| Q | A
| -------------------------------------- | ---
| Branch? | staging for features or enhancements / 3.0 for bug fixes <!-- see below -->
| Bug fix? | yes/no
| New feature? | yes/no
| Deprecations? | yes/no
| BC breaks? | yes/no
| Automated tests included? | yes/no
| Related user documentation PR URL | mautic/mautic-documentation#... <!-- required for new features -->
| Related developer documentation PR URL | mautic/developer-documentation#... <!-- required for developer-facing changes -->
| Issue(s) addressed | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->

| Q | A
| --- | ---
| Bug fix? |
| New feature? |
| Automated tests included? |
| Related user documentation PR URL |
| Related developer documentation PR URL |
| Issues addressed (#s or URLs) |
| BC breaks? |
| Deprecations? |
<!--
Additionally (see https://contribute.mautic.org/contributing-to-mautic/developer/code/pull-requests#step-5-work-on-your-pull-request):
- Always add tests and ensure they pass.
- Bug fixes must be submitted against the lowest maintained branch where they apply
(lowest branches are regularly merged to upper ones so they get the fixes too.)
- Features and deprecations must be submitted against branch staging.
-->

[//]: # ( Note that all new features should have a related user and/or developer documentation PR in their respective repositories. )

[//]: # ( Required: )
<!--
Please write a short README for your feature/bugfix. This will help people understand your PR and what it aims to do.
-->
#### Description:

[//]: # ( As applicable: )
#### Steps to reproduce the bug:
1.
2.
<!--
If you are fixing a bug and if there is no linked issue already, please provide steps to reproduce the issue here.
-->

#### Steps to test this PR:
1. Load up [this PR](https://m3.mautibox.com)
1. Load up [this PR](https://mautibox.com)
2.

#### List deprecations along with the new alternative:
1.
2.

#### List backwards compatibility breaks:
1.
2.
<!--
If you have any deprecations, list them here along with the new alternative.
If you have any backwards compatibility breaks, list them here.
-->

0 comments on commit 1b03924

Please sign in to comment.