Issues template: Improve wording and provide only unstable Flatpak

Until we have a repo with the stable one.

2 files changed, 31 insertions, 29 deletions

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 3c118a3cb..018da90ce 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,7 +1,6 @@
 # Steps to reproduce
 <!--
-    Explain in detail what you were doing when the issue manifested.
-    If the issue affects only certain files, a sample would be appreciated.
+    Explain in detail the steps on how the issue can be reproduced.
 -->
 1.
 2.
@@ -9,31 +8,35 @@
 
 Reproducible in:
 <!--
-    To test, first install Flatpak following the steps in https://flatpak.org/getting.html.
-
-    Ubuntu users should perform these steps:
-        http://docs.flatpak.org/en/latest/using-flatpak.html#add-a-remote
-        http://docs.flatpak.org/en/latest/using-flatpak.html#install-applications (use the links below to install)
-
-    The stable version can be installed from https://flathub.org/repo/appstream/org.gnome.Nautilus.flatpakref.
-    The unstable version can be installed from https://git.gnome.org/browse/gnome-apps-nightly/plain/nautilus.flatpakref.
-
-    If these steps failed, write down the distribution you’re using and the version of Nautilus.
+    Please test if the issue was already fixed in the unstable version of the app.
+    For that, follow these steps:
+    1. Make sure Flatpak is installed or install it following these steps https://flatpak.org/setup
+    2. Install the unstable version of the app following this link 
+    https://git.gnome.org/browse/gnome-apps-nightly/plain/nautilus.flatpakref
+
+    If these steps failed, write in 'Other' the distribution you’re using and
+    the version of the app.
 -->
-* [ ] Flatpak stable
 * [ ] Flatpak unstable
+* [ ] Other: 
+
 
 # Current behavior
-<!-- Describe the current (incorrect) behavior. -->
+<!-- Describe the current behavior. -->
+
 
 # Expected behavior
-<!-- Describe the expected (correct) behavior. -->
+<!-- Describe the expected behavior. -->
+
 
 # Additional information
 <!--
+    Provide more information that could be relevant.
+    
     If the issue is a crash, provide a stack trace following the steps in:
     https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
 -->
 
-<!-- Ignore everything under this line. -->
+
+<!-- Ignore the text under this line. -->
 /label ~"1. Bug"
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 87ea30b10..426acf965 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -1,23 +1,22 @@
-# Desired behavior
-<!-- In as much detail as possible, describe the functionality that you feel is missing. -->
+### Use cases
+<!-- Describe what problem(s) the user is experiencing and that this request
+is trying to solve. -->
 
-…
 
-# Use case
-<!-- Explain how the lack of this functionality affects your workflow. -->
+### Desired behavior
+<!-- Describe the desired functionality. -->
 
-…
 
-<!-- Explain how the implementation of the functionality will improve your workflow. -->
+### Benefits of the solution
+<!-- List the possible benefits of the solution and how it fits in the project. -->
 
-…
 
-# Possible drawbacks
+### Possible drawbacks
 <!--
-    This is equally important; please consider how the feature could affect the project as a whole.
-    Do you believe that the average user will benefit from it? In other words, is it a niche use case?
-    By your estimations, would this incur a large technical debt to the developers?
+     Describe possible drawbacks of the feature and list how it could affect
+     the project i.e. UI discoverability, complexity, impact in more or less
+     number of users, etc.
 -->
 
-<!-- Ignore everything under this line. -->
+<!-- Ignore the text under this line. -->
 /label ~"1. Feature"