From b13ae0e544135ff1e532c407795fd104f8348991 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Sat, 1 May 2021 04:55:07 +0000
Subject: [PATCH] MR template: add more notes

---
 .gitlab/merge_request_templates/App inclusion.md | 7 +++++--
 .gitlab/merge_request_templates/App update.md    | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab/merge_request_templates/App inclusion.md b/.gitlab/merge_request_templates/App inclusion.md
index 6f51f0eb77..823db29705 100644
--- a/.gitlab/merge_request_templates/App inclusion.md	
+++ b/.gitlab/merge_request_templates/App inclusion.md	
@@ -1,7 +1,8 @@
+<!--Please make sure your branch is not protected. See https://docs.gitlab.com/ee/user/project/protected_branches.html. We enable fast-forward merges by default. If your branch is protected, we can't rebase it before merge it.-->
 * [ ] The app complies with the [inclusion criteria](https://f-droid.org/docs/Inclusion_Policy)
-* [ ] The original app author has been notified (and does not oppose the inclusion)
+* [ ] The original app author has been notified (and does not oppose the inclusion)<!--If you are not the author, please paste the link of the reply from the author.-->
 * [ ] All related [fdroiddata](https://gitlab.com/fdroid/fdroiddata/issues) and [RFP issues](https://gitlab.com/fdroid/rfp/issues) have been referenced in this merge request
-* [ ] The upstream app source code repo contains the app metadata _(summary/description/images/changelog/etc)_ in a [Fastlane](https://gitlab.com/snippets/1895688) or [Triple-T](https://gitlab.com/snippets/1901490) folder structure
+* [ ] The upstream app source code repo contains the app metadata _(summary/description/images/changelog/etc)_ in a [Fastlane](https://gitlab.com/snippets/1895688) or [Triple-T](https://gitlab.com/snippets/1901490) folder structure<!--If you are the author, please do add metadata in your repo; If you are not the author, please at least open an issue upstream for the metadata.-->
 * [ ] Builds with `fdroid build`
 * [ ] Releases are tagged
 
@@ -12,3 +13,5 @@ Closes rfp#<RFP issue number>
 
 <!--Add the corresponding issue number or remove this if this merge request does not close an issue at fdroiddata.-->
 Closes fdroiddata#<fdroiddata issue number>
+
+/label ~"New App"
diff --git a/.gitlab/merge_request_templates/App update.md b/.gitlab/merge_request_templates/App update.md
index 8bd7e1d377..7d1f3d2a04 100644
--- a/.gitlab/merge_request_templates/App update.md	
+++ b/.gitlab/merge_request_templates/App update.md	
@@ -1,6 +1,7 @@
+<!--Please make sure your branch is not protected. See https://docs.gitlab.com/ee/user/project/protected_branches.html. We enable fast-forward merges by default. If your branch is protected, we can't rebase it before merge it.-->
 * [ ] The app complies with the [inclusion criteria](https://f-droid.org/docs/Inclusion_Policy)
 * [ ] All related [fdroiddata](https://gitlab.com/fdroid/fdroiddata/issues) have been referenced in this merge request
-* [ ] The upstream app source code repo contains the app metadata _(summary/description/images/changelog/etc)_ in a [Fastlane](https://gitlab.com/snippets/1895688) or [Triple-T](https://gitlab.com/snippets/1901490) folder structure
+* [ ] The upstream app source code repo contains the app metadata _(summary/description/images/changelog/etc)_ in a [Fastlane](https://gitlab.com/snippets/1895688) or [Triple-T](https://gitlab.com/snippets/1901490) folder structure<!--If you are the author, please do add metadata in your repo; If you are not the author, please at least open an issue upstream for the metadata.-->
 * [ ] Builds with `fdroid build`
 * [ ] Releases are tagged