From 6cc753c18e150064fadf2848615e358aa2f25330 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Thu, 3 May 2018 10:38:42 +1000
Subject: [PATCH 1/5] introduce distinct issue templates

---
 .github/ISSUE_TEMPLATE/Bug_report.md      | 71 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/Feature_request.md | 17 ++++++
 2 files changed, 88 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/Bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/Feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 00000000000..7934532b01b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,71 @@
+---
+name: Bug report
+about: Report a problem encountered while using GitHub Desktop
+
+---
+
+<!--
+First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
+
+1. Familiarize yourself with our contributing guide:
+	* https://github.com/desktop/desktop/blob/master/.github/CONTRIBUTING.md#contributing-to-github-desktop
+2. Check if your issue (and sometimes workaround) is in the known-issues doc:
+	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
+3. Make sure your issue isn’t a duplicate of another issue
+4. If you have made it to this step, go ahead and fill out the template below
+-->
+
+## Description
+<!--
+Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
+-->
+
+
+## Version
+<!--
+Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
+-->
+* GitHub Desktop:
+<!--
+Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
+-->
+* Operating system:
+
+
+## Steps to Reproduce
+<!--
+List the steps to reproduce your issue **below** this comment
+ex,
+1. `step 1`
+2. `step 2`
+3. `and so on…`
+-->
+
+### Expected Behavior
+<!-- What you expected to happen -->
+
+### Actual Behavior
+<!-- What actually happens -->
+
+
+## Additional Information
+<!--
+Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
+
+If you have screen shots or gifs that demonstrate the issue, please include them.
+
+If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
+
+If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
+https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
+-->
+
+### Logs
+<!--
+Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
+
+macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
+Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
+
+The log files are organized by date, so see if anything was generated for today's date.
+-->
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000000..f1de657d293
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea to improve GitHub Desktop
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From d8fa04975872ebee4f3568737acb2453e930a179 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Thu, 3 May 2018 10:50:34 +1000
Subject: [PATCH 2/5] make these lowercase because it hurts my sensibilities

---
 .github/ISSUE_TEMPLATE/{Bug_report.md => bug_report.md}           | 0
 .github/ISSUE_TEMPLATE/{Feature_request.md => feature_request.md} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .github/ISSUE_TEMPLATE/{Bug_report.md => bug_report.md} (100%)
 rename .github/ISSUE_TEMPLATE/{Feature_request.md => feature_request.md} (100%)

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/Feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.md

From 091de8152c0faced3b86b61c019d90bf63655ef7 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Thu, 3 May 2018 10:50:53 +1000
Subject: [PATCH 3/5] remove old template

---
 .github/ISSUE_TEMPLATE.md | 65 ---------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 41d8e9e7452..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-First and foremost, we’d like to thank you for taking the time to contribute to our project. Before submitting your issue, please follow these steps:
-
-1. Familiarize yourself with our contributing guide:
-	* https://github.com/desktop/desktop/blob/master/.github/CONTRIBUTING.md#contributing-to-github-desktop
-2. Check if your issue (and sometimes workaround) is in the known-issues doc:
-	* https://github.com/desktop/desktop/blob/master/docs/known-issues.md
-3. Make sure your issue isn’t a duplicate of another issue
-4. If you have made it to this step, go ahead and fill out the template below
--->
-
-## Description
-<!--
-Provide a detailed description of the behavior you're seeing or the behavior you'd like to see **below** this comment.
--->
-
-
-## Version
-<!--
-Place the version of GitHub Desktop you have installed **below** this comment. This is displayed under the 'About GitHub Desktop' menu item. If you are running from source, include the commit by running `git rev-parse HEAD` from the local repository.
--->
-* GitHub Desktop:
-<!--
-Place the version of your operating system **below** this comment. The operating system you are running on may also help with reproducing the issue. If you are on macOS, launch 'About This Mac' and write down the OS version listed. If you are on Windows, open 'Command Prompt' and attach the output of this command: 'cmd /c ver'
--->
-* Operating system:
-
-
-## Steps to Reproduce
-<!--
-List the steps to reproduce your issue **below** this comment
-ex,
-1. `step 1`
-2. `step 2`
-3. `and so on…`
--->
-
-### Expected Behavior
-<!-- What you expected to happen -->
-
-### Actual Behavior
-<!-- What actually happens -->
-
-
-## Additional Information
-<!--
-Place any additional information, configuration, or data that might be necessary to reproduce the issue **below** this comment.
-
-If you have screen shots or gifs that demonstrate the issue, please include them.
-
-If the issue involves a specific public repository, including the information about it will make it easier to recreate the issue.
-
-If you are dealing with a performance issue or regression, attaching a Timeline profile of the task will help the developers understand the runtime behavior of the application on your machine.
-https://github.com/desktop/desktop/blob/master/docs/contributing/timeline-profile.md
--->
-
-### Logs
-<!--
-Attach your log file (You can simply drag your file here to insert it) to this issue. Please make sure the generated link to your log file is **below** this comment section otherwise it will not appear when you submit your issue.
-
-macOS logs location: `~/Library/Application Support/GitHub Desktop/logs/*.desktop.production.log`
-Windows logs location: `%APPDATA%\GitHub Desktop\logs\*.desktop.production.log`
-
-The log files are organized by date, so see if anything was generated for today's date.
--->

From 6fe3ed19d6c204f4952d360682722caf00b7a224 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Fri, 4 May 2018 11:39:09 +1000
Subject: [PATCH 4/5] emojiiii

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7934532b01b..56219510678 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Report a problem encountered while using GitHub Desktop
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f1de657d293..243efc85410 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: 🎉 Feature request
 about: Suggest an idea to improve GitHub Desktop
 
 ---

From d2349aa28943bff60ea7b0cc97d9693cb3f98ce2 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Fri, 4 May 2018 11:40:19 +1000
Subject: [PATCH 5/5] revise issue template

---
 .github/ISSUE_TEMPLATE/feature_request.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 243efc85410..5602d04593b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +1,17 @@
 ---
 name: 🎉 Feature request
 about: Suggest an idea to improve GitHub Desktop
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is. Ex. I have an issue when [...]
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+A clear and concise description of what you want to happen. Add any considered drawbacks.
 
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+**Teachability, Documentation, Adoption, Migration Strategy**
+If you can, explain how users will be able to use this. This will help the core team understand how the feture would work, and assist with future work like documentation.
+Screenshots or mockups here are a great help!
\ No newline at end of file