commit b2f4f26eda612f74350a83ae736c2b2c71f31f64
parent 8469784d74af0fb4891923cf7d1d4dda90a20a79
Author: Morgan <morgan@torproject.org>
Date: Thu, 4 Dec 2025 16:07:23 +0000
fixup! BB 43615: Add Gitlab Issue and Merge Request templates
- add time-gated feature issue template
- add a revert patchset issue template
Diffstat:
3 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/.gitlab/issue_templates/041 Time-Gated Feature.md b/.gitlab/issue_templates/041 Time-Gated Feature.md
@@ -0,0 +1,50 @@
+# 🕰️ Time-Gated Feature
+<!--
+Use this template to track implementation of some time-gated feature.
+Please try to make the title a good one-liner for the changelogs!
+
+Some good (hypothetical) titles:
+- Implement Year End Campaign 3000
+- Add User Survey link to about:tor
+- Spring Funding Campaign about:tor take-over
+-->
+
+## Description
+<!--
+Provide an overview of the technical/implementation aspects of this feature
+-->
+
+## Bookkeeping
+
+### Time Window
+<!--
+When should this feature be enabled and disabled?
+-->
+
+- **Start Date**
+ - Date:
+ - Time (UTC):
+
+- **End Date**
+ - Date:
+ - Time (UTC):
+
+### Proposal
+<!-- Add links to associated proposal issues (or delete block) -->
+- tor-browser#xxxxx
+- mullvad-browser#yyy
+
+### Design
+<!-- Add links to associated design issues (or delete block) -->
+- tpo/UX/Design#zzz
+
+<!-- Do not edit beneath this line <3 -->
+### Revert Issue
+<!-- Add link to the associated issue to revert this change -->
+- tor-browser#xxxxx
+- mullvad-browser#yyy
+
+---
+
+/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Type::Feature"
diff --git a/.gitlab/issue_templates/051 Revert.md b/.gitlab/issue_templates/051 Revert.md
@@ -0,0 +1,45 @@
+# ❌ Revert Patchset
+<!--
+This is an issue for tracking reverting a patch-set (e.g. Time-gated features
+which are no longer needed after the expiration date)
+
+Please ensure the title has the following format:
+
+- Revert tor-browser#12345: Title of original issue
+-->
+
+## Bookkeeping
+
+### Time Window
+<!--
+When should this patchset be reverted?
+-->
+
+- **Revert-After Date**
+ - Date:
+
+### Issue(s)
+<!-- issue associated with the original patchset -->
+- tor-browser#xxxxx
+- mullvad-browser#xyz
+
+### Merge Request(s)
+<!-- merge-request associated with the original patchset -->
+- tor-browser!xxxx
+
+### Target Channels
+<!-- Which channel has the commits we need to revert? -->
+- [ ] Alpha
+- [ ] Stable
+
+## Notes
+
+<!-- whatever additional info, context, etc that would be helpful for reverting -->
+
+
+<!-- Do not edit beneath this line <3 -->
+
+---
+
+/label ~"Apps::Product::TorBrowser"
+/label ~"Apps::Type::Chore"
diff --git a/.gitlab/issue_templates/Default.md b/.gitlab/issue_templates/Default.md
@@ -13,7 +13,9 @@ Please select the appropriate issue template from the **Description** drop-down.
- 💣 **Test** - develop a test or update testing infrastructure
- 👣 **Fingerprinting** - open a fingerprinting issue
- ✨ **Feature** - implement new features
+- 🕰️ **Time-Gated Feature** - implement a new feature which must be enabled for a particular window in time
- ⬅️ **Backport** - cherry-pick change to other release channels
+- ❌ **Revert** - revert a change
- ⤵️ **Rebase - Alpha** - rebase alpha to latest Firefox ESR version
- ⤵️ **Rebase - Stable** - rebase stable to latest Firefox ESR version
- ⤵️ **Rebase - Rapid** - rebase rapid to latest Firefox Nightly version
