From 404476240ea9f72f7511348f5f2363cb6877d9b0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 24 Jul 2023 16:14:39 -0700
Subject: [PATCH] feat: :technologist: pull request template

---
 .gitlab/issue_templates/bug.md                | 11 ++------
 .gitlab/issue_templates/feature.md            | 11 ++------
 .gitlab/merge_request_templates/default.md    |  9 ++++++
 .../pull_request_template.yml                 | 28 -------------------
 4 files changed, 13 insertions(+), 46 deletions(-)
 create mode 100644 .gitlab/merge_request_templates/default.md
 delete mode 100644 .gitlab/merge_request_templates/pull_request_template.yml

diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index 374626db33..3bf5ee07ca 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -1,14 +1,7 @@
----
-name: 🐛 Bug Report
-about: File a bug report
-title: "[Bug]: "
-blank_issues_enabled: true
----
-
-💖 Thanks for taking the time to fill out this bug report!
+<!-- 💖 Thanks for taking the time to fill out this bug report!
 💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com)
 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md)
-🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md)
+🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md) -->
 
 **What happened?** _(Please give us a brief description of what happened.)_
 
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index c288a83d4a..1b714f9d3a 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,14 +1,7 @@
----
-name: ✨ Feature Request
-about: Request a Feature
-title: "[Feature]: "
-blank_issues_enabled: true
----
-
-💖 Thanks for taking the time to fill out this feature request!
+<!-- 💖 Thanks for taking the time to fill out this bug report!
 💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com)
 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md)
-🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md)
+🤝 By submitting this feature request, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md) -->
 
 **What feature would you like implemented?** _(Please give us a brief description of what you'd like.)_
 
diff --git a/.gitlab/merge_request_templates/default.md b/.gitlab/merge_request_templates/default.md
new file mode 100644
index 0000000000..34aa22bba2
--- /dev/null
+++ b/.gitlab/merge_request_templates/default.md
@@ -0,0 +1,9 @@
+<!-- Thanks for taking the time to make Firefish better! It's not required, but please consider using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) when making your commits. If you use VSCode, please use the [Conventional Commits extension](https://marketplace.visualstudio.com/items?itemName=vivaxy.vscode-conventional-commits). -->
+
+**What does this PR do?** _(Please give us a brief description of what this PR does.)_
+
+**Contribution Guidelines**
+By submitting this issue, you agree to follow our [Contribution Guidelines](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md)
+- [ ] I agree to follow this project's Contribution Guidelines
+- [ ] I have made sure to test this pull request
+- [ ] I have made sure to run `pnpm run format` before submitting this pull request
diff --git a/.gitlab/merge_request_templates/pull_request_template.yml b/.gitlab/merge_request_templates/pull_request_template.yml
deleted file mode 100644
index 60fd110008..0000000000
--- a/.gitlab/merge_request_templates/pull_request_template.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Pull Request
-about: Create a pull request
-title: "[PR]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-                Thanks for taking the time to make Firefish better! It's not required, but please consider using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) when making your commits. If you use VSCode, please use the [Conventional Commits extension](https://marketplace.visualstudio.com/items?itemName=vivaxy.vscode-conventional-commits).
-  - type: textarea
-    id: about
-    attributes:
-      label: What does this PR do?
-      description: Please give us a brief description of what this PR does.
-      placeholder: Makes Firefish so amazing by...
-    validations:
-      required: true
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Contribution Guidelines
-      description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/CONTRIBUTING.md)
-      options:
-        - label: I agree to follow this project's Contribution Guidelines
-          required: true
-        - label: I have made sure to test this pull request
-          required: true
-        - label: I have made sure to run `pnpm run format` before submitting this pull request
-          required: true