From f27a5ce85b31e8dcd3b8a57a67e10c022fdf20b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Wed, 27 Nov 2019 18:27:02 +0100
Subject: [PATCH] Fixes issue and merge request templates for gitlab.

---
 .../issue_templates/bug_report.md                      |  4 ++--
 .../merge_request_templates/external_contribution.md   |  9 +++++++++
 PULL_REQUEST_TEMPLATE.md                               | 10 ----------
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename ISSUE_TEMPLATE.md => .gitlab/issue_templates/bug_report.md (87%)
 create mode 100644 .gitlab/merge_request_templates/external_contribution.md
 delete mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/.gitlab/issue_templates/bug_report.md
similarity index 87%
rename from ISSUE_TEMPLATE.md
rename to .gitlab/issue_templates/bug_report.md
index 8c06523127f..b01c0a798ee 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.gitlab/issue_templates/bug_report.md
@@ -4,9 +4,9 @@ Please directly edit it inline to provide the required information.
 
 Before submitting the issue, please confirm (by adding a X in the [ ]):
 
-- [ ] the issue has not yet been reported on [Github](https://github.com/Frama-C/Frama-C-snapshot/issues);
+- [ ] the issue has not yet been reported on [Gitlab](https://git.frama-c.com/pub/frama-c/issues);
 - [ ] the issue has not yet been reported on our [BTS](https://bts.frama-c.com);
-- [ ] you installed Frama-C as prescribed in the [instructions](https://github.com/Frama-C/Frama-C-snapshot/blob/master/INSTALL.md).
+- [ ] you installed Frama-C as prescribed in the [instructions](INSTALL.md).
 
 # Contextual information
 
diff --git a/.gitlab/merge_request_templates/external_contribution.md b/.gitlab/merge_request_templates/external_contribution.md
new file mode 100644
index 00000000000..e7586d07962
--- /dev/null
+++ b/.gitlab/merge_request_templates/external_contribution.md
@@ -0,0 +1,9 @@
+Thank you for submitting a merge request to the Frama-C team.
+We propose the following template to ease the process.
+Please directly edit it inline to provide the required information.
+
+Before submitting the merge request, please confirm (by adding a X in the [ ]):
+
+- [ ] you contributed to Frama-C as prescribed in the [instructions](CONTRIBUTING.md).
+- [ ] if the size of the PR requires it, you have signed the
+  [Contributor Licensing Agreement](CLA.md)
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 65f096b1664..00000000000
--- a/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Thank you for submitting a pull request (PR) to the Frama-C team.
-We propose the following template to ease the process.
-Please directly edit it inline to provide the required information.
-
-Before submitting the PR, please confirm (by adding a X in the [ ]):
-
-- [ ] this pull request is linked to an issue on [Github](https://github.com/Frama-C/Frama-C-snapshot/issues) or on our [BTS](https://bts.frama-c.com);
-- [ ] you contributed to Frama-C as prescribed in the [instructions](https://github.com/Frama-C/Frama-C-snapshot/blob/master/CONTRIBUTING.md).
-- [ ] if the size of the PR requires it, you have signed the
-  [Contributor Licensing Agreement](https://github.com/Frama-C/Frama-C-snapshot/blob/master/CLA.md)
-- 
GitLab