From 0b7c27623bf1f93e443c1f1f201eddde6d9b6c64 Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Fri, 5 Aug 2022 14:29:44 +0300
Subject: [PATCH 1/2] Add initial versions of description templates.

---
 .gitlab/issue_templates/bug_report.md         | 19 +++++++++++++++++++
 .gitlab/issue_templates/generic_issue.md      |  7 +++++++
 .../generic_merge_request.md                  | 12 ++++++++++++
 .../maintenance_task_mr.md                    |  9 +++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 .gitlab/issue_templates/bug_report.md
 create mode 100644 .gitlab/issue_templates/generic_issue.md
 create mode 100644 .gitlab/merge_request_templates/generic_merge_request.md
 create mode 100644 .gitlab/merge_request_templates/maintenance_task_mr.md

diff --git a/.gitlab/issue_templates/bug_report.md b/.gitlab/issue_templates/bug_report.md
new file mode 100644
index 0000000000..8717b34c4b
--- /dev/null
+++ b/.gitlab/issue_templates/bug_report.md
@@ -0,0 +1,19 @@
+### Basic info
+
+Commit SHA: 
+Platform: 
+
+### Bug description
+
+
+### Ways to reproduce
+
+(Clear steps or refer to a failing automated test, e.g. with a pipeline link)
+
+
+
+<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.
+      Add further information to the first row and remove and add labels as necessary.  -->
+
+/label ~Priority:: ~Company: ~Subpart:
+/label ~Type:Bug ~Status::ToDo
diff --git a/.gitlab/issue_templates/generic_issue.md b/.gitlab/issue_templates/generic_issue.md
new file mode 100644
index 0000000000..b1243d30d7
--- /dev/null
+++ b/.gitlab/issue_templates/generic_issue.md
@@ -0,0 +1,7 @@
+(Generic issue template)
+
+<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.
+      Add further information to the first row and remove and add labels as necessary.  -->
+
+/label ~Priority:: ~Company: ~Subpart: ~Type:
+/label ~Status::ToDo
diff --git a/.gitlab/merge_request_templates/generic_merge_request.md b/.gitlab/merge_request_templates/generic_merge_request.md
new file mode 100644
index 0000000000..16da9d39c2
--- /dev/null
+++ b/.gitlab/merge_request_templates/generic_merge_request.md
@@ -0,0 +1,12 @@
+<!--- Basic information that is useful -->
+Related issues:
+Requested reviewers: 
+
+### Description
+
+
+<!--- Labels that are added. Fill as necessary. -->
+/label ~Priority:: ~Company: ~Subpart: ~Type: ~Status::
+
+<!--- Alternatively to labels, you can use "/copy_metadata #number" to get labels from an issue -->
+
diff --git a/.gitlab/merge_request_templates/maintenance_task_mr.md b/.gitlab/merge_request_templates/maintenance_task_mr.md
new file mode 100644
index 0000000000..b431c8d926
--- /dev/null
+++ b/.gitlab/merge_request_templates/maintenance_task_mr.md
@@ -0,0 +1,9 @@
+Requested reviewers: 
+
+### Description
+
+
+<!--- Labels that are added. Fill as necessary. -->
+/label ~Maintenance:
+/label ~Status::
+/label ~Type:
-- 
GitLab


From ba43a408b9a79e8a21a5cc87fde82a2a17fd84fe Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Mon, 8 Aug 2022 16:57:56 +0300
Subject: [PATCH 2/2] Slightly edit Gitlab templates to represent list items
 correctly.

---
 .gitlab/issue_templates/bug_report.md                    | 4 ++--
 .gitlab/merge_request_templates/generic_merge_request.md | 4 ++--
 .gitlab/merge_request_templates/maintenance_task_mr.md   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab/issue_templates/bug_report.md b/.gitlab/issue_templates/bug_report.md
index 8717b34c4b..03c9638b16 100644
--- a/.gitlab/issue_templates/bug_report.md
+++ b/.gitlab/issue_templates/bug_report.md
@@ -1,7 +1,7 @@
 ### Basic info
 
-Commit SHA: 
-Platform: 
+- Commit SHA: 
+- Platform: 
 
 ### Bug description
 
diff --git a/.gitlab/merge_request_templates/generic_merge_request.md b/.gitlab/merge_request_templates/generic_merge_request.md
index 16da9d39c2..495bb9ce77 100644
--- a/.gitlab/merge_request_templates/generic_merge_request.md
+++ b/.gitlab/merge_request_templates/generic_merge_request.md
@@ -1,6 +1,6 @@
 <!--- Basic information that is useful -->
-Related issues:
-Requested reviewers: 
+- Related issues:
+- Requested reviewers: 
 
 ### Description
 
diff --git a/.gitlab/merge_request_templates/maintenance_task_mr.md b/.gitlab/merge_request_templates/maintenance_task_mr.md
index b431c8d926..9ddda469d7 100644
--- a/.gitlab/merge_request_templates/maintenance_task_mr.md
+++ b/.gitlab/merge_request_templates/maintenance_task_mr.md
@@ -1,4 +1,4 @@
-Requested reviewers: 
+- Requested reviewers: 
 
 ### Description
 
-- 
GitLab