From 0a54dd48a083d76a4f006097f46abc088557be86 Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Thu, 17 Jul 2025 16:13:08 -0300
Subject: [PATCH] .gitlab: Make issue templates consistent

---
 .gitlab/issue_templates/Default.md     | 24 ++++++++++++------------
 .gitlab/issue_templates/feature.md     |  8 +++++++-
 .gitlab/issue_templates/performance.md | 19 +++++++++++++------
 .gitlab/issue_templates/security.md    |  7 ++++---
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/.gitlab/issue_templates/Default.md b/.gitlab/issue_templates/Default.md
index a8e4e87c25..1805b463a0 100644
--- a/.gitlab/issue_templates/Default.md
+++ b/.gitlab/issue_templates/Default.md
@@ -2,15 +2,7 @@
 This is the default template for bug reports.
 For feature requests, performance issues and security reports, please switch instead to the appropriate template in the "Choose a template" list.
 
-It is important that you fill all the fields of the template.
-
-There are a few issues we get reports about quite frequently. If you want to check if what you have encountered is among these, please see: 
-https://gitlab.gnome.org/GNOME/gimp/-/issues/?sort=updated_desc&state=all&label_name%5B%5D=Duplication%20target&first_page_size=100
-
-**Code of Conduct**: "Be considerate and respectful" is our main rule.
-E.g. avoid negative emotional writing which only generates more upsetting
-interactions. Thanks!
--->
+It is important that you fill all the fields of the template. -->
 
 ### Environment/Versions
 
@@ -19,14 +11,22 @@ interactions. Thanks!
 - Operating System: <!--[Windows? macOS? Linux? All? Add OS versions too] (write it after the > symbol) -->
 - (if Linux) Display system: <!--[X11? Wayland? Which compositor and version?] (write it after the > symbol) -->
 
-<!--Note: bug reporters are expected to have verified the bug still exists
+<!-- Note: you are expected to have verified the bug still exists
 either in the last stable version of GIMP or on updated development code
-(master branch).-->
+(master branch).
+
+There are a few issues we get reports about quite frequently. If you want to check if what you have encountered is among these, please see: 
+https://gitlab.gnome.org/GNOME/gimp/-/issues/?sort=updated_desc&state=all&label_name%5B%5D=Duplication%20target&first_page_size=100 -->
 
 ### Description of the bug
 
 <!--Please describe your issue with details.
-Add full (not cropped) screenshots or other files if needed.(write it after the > symbol)-->
+
+**Code of Conduct**: "Be considerate and respectful" is our main rule.
+E.g. avoid negative emotional writing which only generates more upsetting
+interactions. Thanks!
+
+Add full (not cropped) screenshots or other files using the clip button on GitLab. -->
 
 ### Reproduction
 
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index 991d37a19d..36bac07198 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,4 +1,8 @@
-**Operating System:** <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
+<!-- ⚠️ IMPORTANT: READ ME! ⚠️
+This is the template for feature requests.
+For bug reports, performance issues and security reports, please switch instead to the appropriate template in the "Choose a template" list.
+
+It is important that you fill all the fields of the template. -->
 
 ### Description of the feature
 
@@ -15,3 +19,5 @@
 <!-- Explain the use cases or problems to solve.
 If you are unsure, you should first discuss with the community in the forums
 or talk with the developers on IRC: https://www.gimp.org/discuss.html -->
+
+/label ~"1. Feature"
diff --git a/.gitlab/issue_templates/performance.md b/.gitlab/issue_templates/performance.md
index 266a5ad3d3..a077b51429 100644
--- a/.gitlab/issue_templates/performance.md
+++ b/.gitlab/issue_templates/performance.md
@@ -1,14 +1,21 @@
+<!-- ⚠️ IMPORTANT: READ ME! ⚠️
+This is the template for performance issues.
+For bug reports, feature requests and security reports, please switch instead to the appropriate template in the "Choose a template" list.
+
+It is important that you fill all the fields of the template. -->
+
 ### Environment/Versions
 
-- GIMP Version:
+- GIMP version number:
 - Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
-- Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
+- Operating System: <!--[Windows? macOS? Linux? All? Add OS versions too] (write it after the > symbol) -->
+- (if Linux) Display system: <!--[X11? Wayland? Which compositor and version?] (write it after the > symbol) -->
 
-<!-- Note: bug reporters are expected to have verified the bug still exists
+<!-- Note: you are expected to have verified the performance issue still exists
 either in the last stable version of GIMP or on updated development code
 (master branch). -->
 
-### Issue Description
+### Description of the performance issue
 
 <!-- Please provide a general description of the issue. -->
 
@@ -25,9 +32,9 @@ For more information, see
 
 <!-- Please describe in detail the actions performed in the performance log.
 If you added empty event markers to the log, please provide a description for them here.
-If you recorded a screencast while recording the log, please attach it here.  -->
+If you recorded a screencast while recording the log, please attach it here. -->
 
-### Additional Information
+### Additional information
 
 <!-- If there is any additional information, please provide it here. -->
 
diff --git a/.gitlab/issue_templates/security.md b/.gitlab/issue_templates/security.md
index ff16085a2b..dae38fe58c 100644
--- a/.gitlab/issue_templates/security.md
+++ b/.gitlab/issue_templates/security.md
@@ -8,13 +8,14 @@ It is important that you fill all the fields of the template. -->
 
 - GIMP version number:
 - Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
-- Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
+- Operating System: <!--[Windows? macOS? Linux? All? Add OS versions too] (write it after the > symbol) -->
+- (if Linux) Display system: <!--[X11? Wayland? Which compositor and version?] (write it after the > symbol) -->
 
-<!-- Note: security reporters are expected to have verified the bug still exists
+<!-- Note: you are expected to have verified the security issue still exists
 either in the last stable version of GIMP or on updated development code
 (master branch). -->
 
-### Security Report Description
+### Description of the security report
 
 <!-- Please provide a general description of the security issue (with CVE code if possible). -->