From 29fa5f29615acbda8a54c0a640d23c033b5d8004 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Thu, 3 Nov 2016 08:19:24 -0400
Subject: [PATCH 1/4] Update ISSUE_TEMPLATE.md

---
 ISSUE_TEMPLATE.md | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 9e813d4a..ab89969b 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,33 +1,35 @@
 I confirm (by marking "x" in the [ ] below): 
 
-- [ ] This is not a feature idea. Feature ideas go here: http://www.mattermost.org/feature-ideas/
 - [ ] This is not a troubleshooting question. Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/
-- [ ] This is a product defect issue that can be reproduced using the steps listed below.
-- [ ] I have read [CONTRIBUTING.md](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md). 
+- [ ] I have read [contributing guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md). 
 
 ---
 
-#### Summary
-
+**Summary**
+<!--
 Issue in one concise sentence.
+-->
 
-#### Steps to reproduce
+**Steps to reproduce**
 
+<!--
 Please include: 
 - Operating System
 - Mattermost Desktop App version (See **Help > Version Number**) 
 - Mattermost Server version (See **Mattermost Menu > About Mattermost**, where **Mattermost Menu** can be accessed by clicking on three dots next to your profile picture) 
 - Clear steps to reproduce the issue
+-->
 
-#### Expected behavior
+**Expected behavior**
 
-Describe your issue in detail.
+**Observed behavior**
 
-#### Observed behavior
+<!--
+Please include relevant error messages and/or screenshots.
+-->
 
-What did you see happen? Please include relevant error messages and/or screenshots.
-
-#### Possible fixes
+**Possible fixes**
 
+<!--
 If you can, link to the line of code that might be responsible for the problem.
-
+-->

From 3fa231c8908d1582e5641d14d59574209a2afa18 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Thu, 3 Nov 2016 08:19:41 -0400
Subject: [PATCH 2/4] Update PULL_REQUEST_TEMPLATE.md

---
 PULL_REQUEST_TEMPLATE.md | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index c6839d44..aa5bf529 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,22 @@
-First of all, please read [`CONTRIBUTING.md`](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md)
+Thank you for planning to submit a pull request and contributing to the Mattermost Desktop application!
 
----
+Before submitting, please confirm you've 
+ - [ ] read and understood our [Contributing Guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md)
+ - [ ] completed [Mattermost Contributor Agreement](http://www.mattermost.org/mattermost-contributor-agreement/)
+ - [ ] executed `npm run prettify` for proper code formatting
 
-- [ ] Complete [Mattermost Contributor Agreement](http://www.mattermost.org/mattermost-contributor-agreement/)
-- [ ] Execute `npm run prettify` to format codes
-- [ ] Update `CHANGELOG.md` and/or `doc/*.md` if it's necessary.
-- [ ] Write about environment which you tested
-  - Operating system
+Please provide the following information:
+
+**Summary**
+<!--
+Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog
+-->
+
+**Issue link**
+<!--
+Please include a link to the GitHub issue this pull request addresses, if applicable.
+-->
+
+**Test Cases**
+
+**Additional Notes**

From ad938d75ac607a1e8286ac7093a1410a24f530bf Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Thu, 3 Nov 2016 09:58:46 -0400
Subject: [PATCH 3/4] Update ISSUE_TEMPLATE.md

---
 ISSUE_TEMPLATE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index ab89969b..c0cc9be7 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,6 +1,7 @@
 I confirm (by marking "x" in the [ ] below): 
 
-- [ ] This is not a troubleshooting question. Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/
+- [ ] This is not a troubleshooting question. [Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/](http://www.mattermost.org/troubleshoot/).
+- [ ] This doesn't reproduce on web browsers (such as in Chrome). If it does, [issue reports go to the Mattermost Server repository](https://github.com/mattermost/platform/issues).
 - [ ] I have read [contributing guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md). 
 
 ---

From 33243e371ced2afad492247d47b848858974087c Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Thu, 3 Nov 2016 23:47:28 -0400
Subject: [PATCH 4/4] Remove thank you note from PULL_REQUEST.md

---
 PULL_REQUEST_TEMPLATE.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index aa5bf529..4b1c4472 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,3 @@
-Thank you for planning to submit a pull request and contributing to the Mattermost Desktop application!
-
 Before submitting, please confirm you've 
  - [ ] read and understood our [Contributing Guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md)
  - [ ] completed [Mattermost Contributor Agreement](http://www.mattermost.org/mattermost-contributor-agreement/)