From 532d9ae6d5f927b966d1561dddb8e9c854f82715 Mon Sep 17 00:00:00 2001
From: Neil Agarwal <neil@neilagarwal.me>
Date: Mon, 23 Mar 2020 04:10:48 +0530
Subject: [PATCH 1/3] [IMPROVEMENT] New PR Template

---
 .github/PULL_REQUEST_TEMPLATE.md | 39 ++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index db905f2f947a..719bf0416462 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,40 @@
-<!-- INSTRUCTION: Your Pull Request name should start with one of the following tags -->
+<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
+<!-- Your Pull Request name should start with one of the following tags -->
 <!-- [NEW] For new features -->
 <!-- [FIX] For bug fixes -->
 <!-- [BREAK] For pull requests including breaking changes -->
 
-<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
-Closes #ISSUE_NUMBER
+## Proposed changes
+<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue below. -->
 
-<!-- INSTRUCTION: Link to a https://github.com/RocketChat/docs PR with added/updated documentation or an update to the missing/outdated documentation list, see https://rocket.chat/docs/contributing/documentation/  -->
+## Closes issue(s)
+<!-- Link the issues being closed by this PR. For example, you can use #594 if this PR closes issue number 594 -->
+
+## How to test or reproduce
+<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
+
+## Screenshots
+
+## Types of changes
+<!-- What types of changes does your code introduce to Rocket.Chat? -->
+<!-- Put an `x` in the boxes that apply -->
+
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Hotfix (a major bugfix that has to be merged asap)
+- [ ] Documentation Update (if none of the other choices apply)
+
+## Checklist
+<!-- Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. -->
+
+- [ ] I have read the [CONTRIBUTING](https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat) doc
+- [ ] I have signed the [CLA](https://cla-assistant.io/RocketChat/Rocket.Chat)
+- [ ] Lint and unit tests pass locally with my changes
+- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
+- [ ] I have added necessary documentation (if applicable)
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+## Further comments
+<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
 
-<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->

From b1b1afe96f39857e0536c055071f24ddc4701173 Mon Sep 17 00:00:00 2001
From: Neil Agarwal <neil@neilagarwal.me>
Date: Fri, 27 Mar 2020 16:18:02 +0530
Subject: [PATCH 2/3] .github: Improvements type, Changelog text

---
 .github/PULL_REQUEST_TEMPLATE.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 719bf0416462..c57e62762a88 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,8 +7,8 @@
 ## Proposed changes
 <!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue below. -->
 
-## Closes issue(s)
-<!-- Link the issues being closed by this PR. For example, you can use #594 if this PR closes issue number 594 -->
+## Issue(s)
+<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
 
 ## How to test or reproduce
 <!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
@@ -20,6 +20,7 @@
 <!-- Put an `x` in the boxes that apply -->
 
 - [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] Improvement (non-breaking change which improves a current function)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] Hotfix (a major bugfix that has to be merged asap)
@@ -35,6 +36,9 @@
 - [ ] I have added necessary documentation (if applicable)
 - [ ] Any dependent changes have been merged and published in downstream modules
 
+## Changelog
+<!-- Enter brief text that would go up on the changelog on our releases page -->
+
 ## Further comments
 <!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
 

From 8564d25c4fb53b46136507863e63231f1b4bcd1d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 14 May 2020 11:23:09 -0300
Subject: [PATCH 3/3] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c57e62762a88..b7ce1a785259 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -37,7 +37,9 @@
 - [ ] Any dependent changes have been merged and published in downstream modules
 
 ## Changelog
-<!-- Enter brief text that would go up on the changelog on our releases page -->
+<!-- CHANGELOG -->
+<!-- Enter HERE a brief text that would go up on the changelog on our releases page -->
+<!-- END CHANGELOG -->
 
 ## Further comments
 <!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->