From 5d8588e6826df94018ce793cda10b8282326ed1e Mon Sep 17 00:00:00 2001
From: Michelle Weidling <weidling@sub.uni-goettingen.de>
Date: Tue, 9 Feb 2021 08:51:34 +0100
Subject: [PATCH] chore: update templates

---
 .gitlab/issue_templates/Bug.md             | 30 +++-------------------
 .gitlab/issue_templates/Feature-request.md | 17 ++----------
 .gitlab/merge_request_templates/Bugfix.md  | 12 ++-------
 .gitlab/merge_request_templates/Feature.md | 17 +++---------
 4 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 684cf568..826c514a 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -2,43 +2,19 @@
 
 ## Description
 
-Just leave a short summary what the bug is about and in which context you noticed it.
-Feel free to delete sections that doesn't suit the case you're dealing with.
-
-### I expected the following to happen
-
-…
-
-### On the contrary, I observed
-
-…
+* _I expected the following to happen:_
+* _On the contrary, I observed:_
 
 ## How to reproduce the bug
 
-Please describe briefly how you discovered the bug and what a developer has to do to reproduce it.
-
-_Steps:_
-
 * Step 1
 * Step 2
 * ...
 
 ## Severity
 
-How much impact does this bug have on the product or further development?
-
-* [ ] Minor
-* [ ] Major
-* [ ] Critical
-* [ ] Blocker
-
+Minor/Major/Critical/Blocker
 
 ## Program and – if applicable – dependency version
 
-Which version of the software did you use?
-
-## Related Tickets
-
-Add related issues.
-
 /cc [Mathias Göbel](https://gitlab.gwdg.de/mgoebel), [Frank Schneider](https://gitlab.gwdg.de/schneider210), [Michelle Weidling](https://gitlab.gwdg.de/mrodzis)
diff --git a/.gitlab/issue_templates/Feature-request.md b/.gitlab/issue_templates/Feature-request.md
index 7061151a..7ad42d5b 100644
--- a/.gitlab/issue_templates/Feature-request.md
+++ b/.gitlab/issue_templates/Feature-request.md
@@ -1,22 +1,9 @@
-# Feature Requests
+# Feature Request
 
 ## Description
 
-Just leave a short summary what the feature is about.
-
-## User Stories
+## User Story
 
 As (role of the user) I need (what has to be done) in order to (what I want to achieve with this feature).
 
-## Classification
-
-Is this feature an enhancement of existing code or a completely new feature?
-
-* [ ] enhancement
-* [ ] new feature
-
-## Related Tickets
-
-Add all related issues.
-
 /cc [Mathias Göbel](https://gitlab.gwdg.de/mgoebel), [Frank Schneider](https://gitlab.gwdg.de/schneider210), [Michelle Weidling](https://gitlab.gwdg.de/mrodzis)
diff --git a/.gitlab/merge_request_templates/Bugfix.md b/.gitlab/merge_request_templates/Bugfix.md
index 8f8a830f..8d131bdf 100644
--- a/.gitlab/merge_request_templates/Bugfix.md
+++ b/.gitlab/merge_request_templates/Bugfix.md
@@ -2,22 +2,12 @@
 
 ## Summary
 
-Apart from what is mentioned in the main ticket you are going to close with this
-MR, tell us what you have done to achieve this goal.
-
 ## Compliance to “Definition of Done”
 
 * [ ] Unit tests passed
 * [ ] Code reviewed
-* [ ] Acceptance criteria met
-* [ ] Functional tests passed
-* [ ] Non-Functional requirements met
 * [ ] Product Owner accepts the User Story
 
-### Related
-
-### Closes
-
 ## Changelog
 
 * [ ] I added a statement to the CHANGELOG.
@@ -30,4 +20,6 @@ MR, tell us what you have done to achieve this goal.
 
 * [ ] I updated the README (if applicable) and kept the docs up to date.
 
+## Closes
+
 /cc [Mathias Göbel](https://gitlab.gwdg.de/mgoebel), [Frank Schneider](https://gitlab.gwdg.de/schneider210), [Michelle Weidling](https://gitlab.gwdg.de/mrodzis)
diff --git a/.gitlab/merge_request_templates/Feature.md b/.gitlab/merge_request_templates/Feature.md
index 80fee9d4..1ce6219c 100644
--- a/.gitlab/merge_request_templates/Feature.md
+++ b/.gitlab/merge_request_templates/Feature.md
@@ -2,21 +2,14 @@
 
 ## Summary
 
-This MR provides…
+This MR provides 
 
 ## Compliance to “Definition of Done”
 
 * [ ] Unit tests passed
 * [ ] Code reviewed
-* [ ] Acceptance criteria met
-* [ ] Functional tests passed
-* [ ] Non-Functional requirements met
 * [ ] Product Owner accepts the User Story
 
-## Use Cases
-
-If you can, please provide use cases for this feature.
-
 ## Documentation
 
 * [ ] I updated the README (if applicable)
@@ -39,13 +32,9 @@ Are we able to test this new feature?
 
 * [ ] I bumped the version number in `build.properties`.
 
-## Related Tickets
-
-Add all related issues and especially those to be closed.
-
-### Related
+## Closes
 
-### Closes
+Closes
 
 ## Logs and Screenshots
 
-- 
GitLab