From 308dad8ddc625e42ad080f6623aad476babde39b Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 13 Jul 2017 16:40:29 -0300
Subject: [PATCH 1/4] Better Issue Template

---
 .github/ISSUE_TEMPLATE.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 18487542d650..0c02a58e38cc 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,32 @@
+Thanks for opening an issue! A few things to keep in mind before moving forward:
+
+  - Please note that an issue is not the best place to ask questions. Using [Stack Overflow](https://stackoverflow.com/questions/tagged/rocket.chat) or [Server Fault](https://serverfault.com/search?q=Rocket.Chat) for that is more appropriate. Also don't forget to search our [Documentation](https://rocket.chat/docs/)
+
+  - Please [search our issues](https://github.com/RocketChat/Rocket.Chat/issues) for an existing issue before opening a new one. This helps us keep all information we need to fix the issue in one place.
+
+  - Before reporting a bug, please try reproducing your issue against the latest version of Rocket.Chat and don't forget to include any errors on your console (browser and server).
+
 <!-- INSTRUCTION: Complete the information below from your Administration page -->
 
 Rocket.Chat Version: 
 Running Instances: 
 DB Replicaset OpLog:
 Node Version:
+
+### Description
+
+<!-- Description of the issue -->
+
+### Steps to Reproduce
+
+1. <!-- First Step -->
+2. <!-- Second Step -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- What you expect to happen -->
+
+## Actual behavior:
+
+<!-- What actually happens -->

From 858aad42c705a98914355d9b89ac2451fa7ca1ed Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 14 Jul 2017 09:53:25 -0300
Subject: [PATCH 2/4] Add link to the logs page

and fix some line breaks and heading
---
 .github/ISSUE_TEMPLATE.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 0c02a58e38cc..8f24373d29a5 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ Thanks for opening an issue! A few things to keep in mind before moving forward:
 
   - Please [search our issues](https://github.com/RocketChat/Rocket.Chat/issues) for an existing issue before opening a new one. This helps us keep all information we need to fix the issue in one place.
 
-  - Before reporting a bug, please try reproducing your issue against the latest version of Rocket.Chat and don't forget to include any errors on your console (browser and server).
+  - Before reporting a bug, please try reproducing your issue against the latest version of Rocket.Chat and don't forget to include any errors on your [console](https://rocket.chat/docs/contributing/reporting-issues#gathering-logs) (browser and server).
 
 <!-- INSTRUCTION: Complete the information below from your Administration page -->
 
@@ -20,13 +20,15 @@ Node Version:
 ### Steps to Reproduce
 
 1. <!-- First Step -->
+
 2. <!-- Second Step -->
+
 3. <!-- and so on... -->
 
 ### Expected behavior:
 
 <!-- What you expect to happen -->
 
-## Actual behavior:
+### Actual behavior:
 
 <!-- What actually happens -->

From a33f24d10cdde94a3e1f8ed463b43826f6d535ff Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Wed, 19 Jul 2017 16:36:10 -0400
Subject: [PATCH 3/4] A few changes from feedback

---
 .github/ISSUE_TEMPLATE.md | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8f24373d29a5..8e29d52a695b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,28 +1,30 @@
-Thanks for opening an issue! A few things to keep in mind before moving forward:
+<!-- 
 
-  - Please note that an issue is not the best place to ask questions. Using [Stack Overflow](https://stackoverflow.com/questions/tagged/rocket.chat) or [Server Fault](https://serverfault.com/search?q=Rocket.Chat) for that is more appropriate. Also don't forget to search our [Documentation](https://rocket.chat/docs/)
+Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
 
-  - Please [search our issues](https://github.com/RocketChat/Rocket.Chat/issues) for an existing issue before opening a new one. This helps us keep all information we need to fix the issue in one place.
+If you have questions or are looking for help/support please see: https://rocket.chat/docs/getting-support
 
-  - Before reporting a bug, please try reproducing your issue against the latest version of Rocket.Chat and don't forget to include any errors on your [console](https://rocket.chat/docs/contributing/reporting-issues#gathering-logs) (browser and server).
+If you are experiencing a bug please search our issues to be sure it is not already present: https://github.com/RocketChat/Rocket.Chat/issues
 
-<!-- INSTRUCTION: Complete the information below from your Administration page -->
+-->
 
-Rocket.Chat Version: 
-Running Instances: 
-DB Replicaset OpLog:
-Node Version:
-
-### Description
+### Description:
 
 <!-- Description of the issue -->
 
-### Steps to Reproduce
+### Server Setup Information:
 
-1. <!-- First Step -->
+* Version of Rocket.Chat Server:
+* Operating System:
+* Deployment Method(snap/docker/tar/etc):
+* Number of Running Instances: 
+* DB Replicaset Oplog:
+* Node Version:
 
-2. <!-- Second Step -->
+### Steps to Reproduce:
 
+1. <!-- First Step -->
+2. <!-- Second Step -->
 3. <!-- and so on... -->
 
 ### Expected behavior:
@@ -32,3 +34,6 @@ Node Version:
 ### Actual behavior:
 
 <!-- What actually happens -->
+
+### Relevant logs:
+<!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->

From e0a9e70445ebedd4c80a9b49647d643f6191f132 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 20 Jul 2017 11:33:30 -0300
Subject: [PATCH 4/4] Ask for browser and server logs

---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8e29d52a695b..37465b0ef121 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -36,4 +36,5 @@ If you are experiencing a bug please search our issues to be sure it is not alre
 <!-- What actually happens -->
 
 ### Relevant logs:
+<!-- Logs from both server and browser -->
 <!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->