From cdd01262d23e92b445cbb757005278358a6097d8 Mon Sep 17 00:00:00 2001
From: Jonas Zohren <gitlab-jfowl-0ux98@sh14.de>
Date: Sun, 18 Jul 2021 20:43:21 +0000
Subject: [PATCH] Shorten more templates

---
 .github/ISSUE_TEMPLATE/Issue.md            |  2 +-
 .gitlab/issue_templates/Feature Request.md | 13 +------------
 .gitlab/merge_request_templates/MR.md      |  4 ++--
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/Issue.md b/.github/ISSUE_TEMPLATE/Issue.md
index 9022062f..78896651 100644
--- a/.github/ISSUE_TEMPLATE/Issue.md
+++ b/.github/ISSUE_TEMPLATE/Issue.md
@@ -8,4 +8,4 @@ title: "CLOSE ME"
 
 **⚠️ Conduit development does not happen on GitHub. Issues opened here will not be addressed** 
 
-Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new
\ No newline at end of file
+Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new
diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
index 4100eb62..3f636e71 100644
--- a/.gitlab/issue_templates/Feature Request.md	
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -6,22 +6,11 @@ then please consider filling out a "Bug Report" instead!
 
 ### 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 [...] -->
+<!-- Eg. 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. -->
 
 
 
diff --git a/.gitlab/merge_request_templates/MR.md b/.gitlab/merge_request_templates/MR.md
index cf3c09e4..c592a3b2 100644
--- a/.gitlab/merge_request_templates/MR.md
+++ b/.gitlab/merge_request_templates/MR.md
@@ -1,8 +1,8 @@
 
-<!-- Please describe your changes here in a concise manner -->
+<!-- Please describe your changes here -->
 
 -----------------------------------------------------------------------------
 
-- [ ] I ran `cargo fmt --all`, `cargo test --workspace` and `cargo clippy`
+- [ ] I ran `cargo fmt` and `cargo test`
 - [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license