From ee771e8e5201691a8597a2e85590dd617b31647e Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Thu, 8 Nov 2018 23:59:42 -0500
Subject: [PATCH] add gitlab templates

---
 .gitlab/issue_templates/BUG_REPORT.md         | 23 ++++++++++++++++
 .gitlab/issue_templates/FEATURE_REQUEST.md    | 11 ++++++++
 .../merge_request_templates/PULL_REQUEST.md   | 24 +++++++++++++++++
 ISSUE_TEMPLATE.md                             | 26 -------------------
 PULL_REQUEST_TEMPLATE.md                      |  4 ---
 5 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 .gitlab/issue_templates/BUG_REPORT.md
 create mode 100644 .gitlab/issue_templates/FEATURE_REQUEST.md
 create mode 100644 .gitlab/merge_request_templates/PULL_REQUEST.md
 delete mode 100644 ISSUE_TEMPLATE.md
 delete mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/.gitlab/issue_templates/BUG_REPORT.md b/.gitlab/issue_templates/BUG_REPORT.md
new file mode 100644
index 00000000..306c69c4
--- /dev/null
+++ b/.gitlab/issue_templates/BUG_REPORT.md
@@ -0,0 +1,23 @@
+# Bug report
+
+* [ ] Did you check if there wasn't a similar bug report or PR open to fix similar bug?
+* [ ] Are you using the [latest version](https://framagit.org/dystopia-project/simple-email/tags) of the app?
+
+-------------------------------------------
+
+## Expected behavior
+
+
+## Actual behavior
+
+
+## Steps to reproduce the problem
+
+1.
+2.
+3.
+
+## Version
+
+* App version:
+* Android version:
diff --git a/.gitlab/issue_templates/FEATURE_REQUEST.md b/.gitlab/issue_templates/FEATURE_REQUEST.md
new file mode 100644
index 00000000..dca415b5
--- /dev/null
+++ b/.gitlab/issue_templates/FEATURE_REQUEST.md
@@ -0,0 +1,11 @@
+# Feature request
+
+* [ ] Did you check if there wasn't a similar feature request or open a PR with similar feature?
+* [ ] Did you read [this FAQ](https://framagit.org/dystopia-project/simple-email/blob/master/docs/FAQ.md#can-you-add-)?
+
+-------------------------------------------
+
+## Expected behavior
+
+
+## Actual behavior
diff --git a/.gitlab/merge_request_templates/PULL_REQUEST.md b/.gitlab/merge_request_templates/PULL_REQUEST.md
new file mode 100644
index 00000000..cf0c709f
--- /dev/null
+++ b/.gitlab/merge_request_templates/PULL_REQUEST.md
@@ -0,0 +1,24 @@
+### Comments/Description:
+
+Thank you for taking the time to submit your changes to SimpleEmail and help us
+making it better step by step! :+1: :clap:
+
+Thank you for contributing.
+
+**You may now delete all this text and add a description of your changes.**
+
+-------------------------------------------
+
+# Important
+
+* [ ] Added description to PR
+* [ ] Linked issue ticket(s) to PR
+* [ ] Passing the lint
+* [ ] I read the [contributing section](https://framagit.org/dystopia-project/simple-email/blob/master/CONTRIBUTING.md) and agree to them
+* [ ] I agree to [the license](https://framagit.org/dystopia-project/simple-email/tree/master#license)
+
+### Addresses issue(s):
+
+- Ticket: *If applicable or exists*
+
+-------------------------------------------
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 05314f1b..00000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Feature request
-
-* Did you check if there wasn't a similar feature request or open a PR with similar feature?
-* Did you read [this FAQ](https://framagit.org/dystopia-project/simple-email/blob/master/docs/FAQ.md#can-you-add-)?
-
-# Bug report
-
-* Did you check if there wasn't a similar bug report or PR open to fix similar bug?
-* Are you using the [latest version](https://framagit.org/dystopia-project/simple-email/tags) of the app?
-
-## Expected behavior
-
-
-## Actual behavior
-
-
-## Steps to reproduce the problem
-
-1.
-2.
-3.
-
-## Version
-
-* App version:
-* Android version:
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 764e1e02..00000000
--- a/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Important
-
-* Did you read the [contributing section](https://framagit.org/dystopia-project/simple-email/blob/master/CONTRIBUTING.md)?
-* Do you agree to [the license and the copyright](https://framagit.org/dystopia-project/simple-email/tree/master#license)?