commit 4b0786ba4ce254dea8e6339aacabf571920a0766 parent b32243f894792b8bc0632e009980c9942be30ff0 Author: Morgan <morgan@torproject.org> Date: Wed, 11 Feb 2026 16:26:35 +0000 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates remove Mullvad Browser-specfic rebase steps Diffstat:
| M | .gitlab/issue_templates/060 Rebase - Alpha.md | | | 18 | ------------------ |
| M | .gitlab/issue_templates/061 Rebase - Stable.md | | | 14 | -------------- |
2 files changed, 0 insertions(+), 32 deletions(-)
diff --git a/.gitlab/issue_templates/060 Rebase - Alpha.md b/.gitlab/issue_templates/060 Rebase - Alpha.md @@ -78,24 +78,6 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - [ ] `base-browser-...-2-build1` - [ ] Make `tor-browser-...-2` the default branch -- Rebase Mullvad Browser - - Prepare the rebase - - [ ] Push the `base-browser-*` tag - - [ ] Freeze the current default branch - - [ ] Create the target branch (`mullvad-browser-...-1`) - - Do the rebase - - [ ] Cherry-pick commits until `mullvad-browser-...-build1` - - [ ] Squash (`git rebase --autosquash base-browser-...-build1`) - - [ ] Cherry-pick the remaining commits - - [ ] Reorder commits - - Merge - - [ ] Perform a self-review (`git range-diff` + diff of diffs) - - [ ] Run linters - - [ ] File a merge request - - [ ] Tag and update the repository - - [ ] Tag `mullvad-browser-...-build1` - - [ ] Make `mullvad-browser-...-2` the default branch - --- /label ~"Apps::Product::TorBrowser" diff --git a/.gitlab/issue_templates/061 Rebase - Stable.md b/.gitlab/issue_templates/061 Rebase - Stable.md @@ -25,20 +25,6 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - [ ] `tor-browser-...-build1` - [ ] `base-browser-...-build1` -- Rebase Mullvad Browser - - Prepare the rebase - - [ ] Push the `base-browser-*` tag - - Do the rebase - - [ ] Cherry-pick commits until `mullvad-browser-...-build1` - - [ ] Squash (`git rebase --autosquash base-browser-...-build1`) - - [ ] Cherry-pick the remaining commits - - [ ] Reorder commits - - Merge - - [ ] Perform a self-review (`git range-diff` + diff of diffs) - - [ ] Run linters - - Tag - - [ ] `mullvad-browser-...-build1` - --- /label ~"Apps::Product::TorBrowser"