From 3193a126713a2afd2fffa30dec1c9e0ca01aee7d Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:29:19 +0100
Subject: [PATCH] Fix/improve issue templates (#3232)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml             | 4 ----
 .github/ISSUE_TEMPLATE/{config.yaml => config.yml} | 3 +++
 .github/ISSUE_TEMPLATE/feature_request.yaml        | 2 --
 .pre-commit-config.yaml                            | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename .github/ISSUE_TEMPLATE/{config.yaml => config.yml} (72%)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 90c9e4a82..3e0adc152 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -58,13 +58,9 @@ body:
       options:
         # - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
         #   required: true
-        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
-          required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true
         - label: Check that there isn't [already an issue](https://github.com/woodpecker-ci/woodpecker/issues) that reports the same bug to avoid creating a duplicate.
           required: true
         - label: Checked that the bug isn't fixed in the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
           required: true
-        - label: Check that this is a concrete bug. For Q&A join our [Discord Chat Server](https://discord.gg/fcMQqSMXJy) or the [Matrix room](https://matrix.to/#/#woodpecker:matrix.org).
-          required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 72%
rename from .github/ISSUE_TEMPLATE/config.yaml
rename to .github/ISSUE_TEMPLATE/config.yml
index c0eb8c63d..0bcb8cbe5 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,3 +6,6 @@ contact_links:
   - name: Frequently Asked Questions
     url: https://woodpecker-ci.org/faq
     about: Check the FAQs for common questions.
+  - name: Support
+    url: https://github.com/woodpecker-ci/.github/blob/main/SUPPORT.md
+    about: Information about how you can get support.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 212c4c123..93fedada4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -41,8 +41,6 @@ body:
         #   required: true
         - label: Checked that the feature isn't part of the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
           required: true
-        - label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
-          required: true
         - label: Read the [docs](https://woodpecker-ci.org/docs/intro).
           required: true
         - label: Check that there isn't already an [issue](https://github.com/woodpecker-ci/woodpecker/issues) that request the same feature to avoid creating a duplicate.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 28bdf556b..63debc5bb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,7 +42,7 @@ repos:
         entry: YAML filenames must have .yaml extension.
         language: fail
         files: .yml$
-        exclude: '^.gitpod.yml$'
+        exclude: '^(.gitpod.yml|.github/ISSUE_TEMPLATE/config.yml)$'
 
 ci:
   autofix_commit_msg: |