Commit 75f63014 authored by morgan's avatar morgan 😸
Browse files

fixup! MB 188: Customize Gitlab Issue and Merge templates 

revert
parent 95294e0a

.gitlab/issue_templates/Backport.md

+4 −3
Changes for .gitlab/issue_templates/Backport.md: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line 
<!--

Title:

    Backport mullvad-browser#123: Title of Issue

    Backport tor-browser#12345: Title of Issue

    Backport Bugzilla 1234567: Title of Issue



This is an issue for tracking back-porting a patch-set (e.g. from Alpha to Stable or from Mozilla Rapid-Release to Alpha)
@@ -10,18 +10,19 @@ This is an issue for tracking back-porting a patch-set (e.g. from Alpha to Stabl 


### Book-keeping



#### Gitlab Issue(s)

#### Issue(s)

- tor-browser#12345

- mullvad-browser#123

- https://bugzilla.mozilla.org/show_bug.cgi?id=1234567



#### Merge Request(s)

- mullvad-browser!123

- tor-browser!123



#### Target Channels



- [ ] Alpha

- [ ] Stable

- [ ] Legacy



### Notes

.gitlab/issue_templates/Emergency Security Issue.md

+10 −5
Changes for .gitlab/issue_templates/Emergency Security Issue.md: 10 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
### Type of Issue: What are we dealing with?



- [ ] Security (sandbox escape, remote code execution, etc)

- [ ] Cross-Site Linkability (correlating sessions across websites)

- [ ] Proxy Bypass (traffic contents becoming MITM'able)

- [ ] De-Anonymization (otherwise identifying which website a user is visiting)

- [ ] Cross-Site Linkability (correlating sessions across circuits and websites)

- [ ] Disk Leak (persisting session information to disk)

- [ ] Other (please explain)
@@ -34,11 +36,16 @@ 
  - [ ] **richard** : signing, release

  - [ ] **thorin** : fingerprinting

- [ ] Other Engineering Teams

  - [ ] Networking (**ahf**, **dgoulet**)

  - [ ] Anti-Censorship (**meskio**, **cohosh**)

  - [ ] UX (**donuts**)

  - [ ] TPA (**anarcat**, **lavamind**)

- [ ] External Tor Partners

  - [ ] Mozilla (**tjr**)

  - [ ] Mullvad (**ruihildt**)

  - [ ] Mozilla

  - [ ] Mullvad

  - [ ] Brave

  - [ ] Guardian Project (Orbot, Onion Browser)

  - [ ] Tails

  - [ ] Other (please list)



### Urgency: When do we need to act?
@@ -65,7 +72,6 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad 


- [ ] Start an initial email thread with the following people:

  - [ ] **bella**

  - [ ] **ruihildt**, **support@mullvadvpn.net**

  - [ ] Relevant Applications Developers

  - [ ] **(Optional)** **micah**

    - if there are considerations or asks outside the Applications Team
@@ -78,7 +84,6 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad 
/cc @ma1

/cc @micah

/cc @richard

/cc @ruihildt



/confidential

.gitlab/issue_templates/Rebase Browser - Alpha.md

deleted100644 → 0
+0 −88
Changes for .gitlab/issue_templates/Rebase Browser - Alpha.md: 0 added lines, 88 removed lines.
Original line number Diff line number Diff line 
**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr



<details>

  <summary>Explanation of Variables</summary>



- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc

  - **Example**: `102.8.0`

- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`

  - **Example**: `FIREFOX_102_8_0esr_RELEASE`

- `$(BROWSER_MAJOR)`: the browser major version

  - **Example**: `12`

- `$(BROWSER_MINOR)`: the browser minor version

  - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`

- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch

  - **Example**: `base-browser-102.8.0esr-12.5-1`

- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch

  - **Example**: `base-browser-102.7.0esr-12.5-1`

- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`

  - **Example**: `base-browser-102.8.0esr-12.5-1-build1`

- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`

  - **Example**: `base-browser-102.7.0esr-12.5-1-build1`

- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch

  - **Example**: `mullvad-browser-102.8.0esr-12.5-1`

- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch

  - **Example**: `mullvad-browser-102.7.0esr-12.5-1`

</details>



**NOTE:** It is assumed that we've already rebased and tagged `base-browser` alpha and that we've already rebased `mullvad-browser` stable



### **Bookkeeping**



- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Apps%3A%3AType%3A%3AReleasePreparation) issue.



### Update Branch Protection Rules



- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/settings/repository):

  - [ ] Remove previous alpha `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)

  - [ ] Create new `mullvad-browser` branch protection rule:

    - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`

      - **Example**: `mullvad-browser-102.8.0esr-12.5-1*`

    - **Allowed to merge**: `Maintainers`

    - **Allowed to push and merge**: `Maintainers`

    - **Allowed to force push**: `false`



### **Create and Push New Branch**



- [ ] Create new alpha `mullvad-browser` branch from this ESR's alpha `base-browser` tag

  - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`

  - **Example**: `git branch mullvad-browser-102.8.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1`

- [ ] Push new `mullvad-browser` branch to `upstream`

- [ ] Push `base-browser` tag to `upstream`



### **Rebase tor-browser**



- [ ] Checkout a new local branch for the `mullvad-browser` rebase

  - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.5-1`

- [ ] `mullvad-browser` rebase

  - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag

    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..mullvad-browser-102.7.0esr-12.5-1-build1`

  - [ ] Rebase and autosquash these newly cherry-picked commits

    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.5-1`

  - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag

    - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.5-1-build1..upstream/mulvad-browser-102.7.0esr-12.5-1`

  - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.

    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.5-1`

- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:

  - [ ] diff of diffs:

    -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -

    - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`

    - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > rebased_patchset.diff`

    - diff `current_patchset.diff` and `rebased_patchset.diff`

      - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `mullvad-browser` branch)

  - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`

    - **Example**: `git range-diff base-browser-102.7.0esr-12.5-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`

- [ ] Open MR for the `mullvad-browser` rebase

- [ ] Merge



### **Sign and Tag**



- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:

  - In **mullvad-browser.git**, checkout the new alpha `mullvad-browser` branch

  - In **tor-browser-build.git**, run signing script:

    ```bash

    ./tools/browser/sign-tag.mullvadbrowser alpha build1

    ```

  - [ ] Push tag to `upstream`



/label ~"Apps::Type::Rebase"

.gitlab/issue_templates/Rebase Browser - Rapid.md

deleted100644 → 0
+0 −85
Changes for .gitlab/issue_templates/Rebase Browser - Rapid.md: 0 added lines, 85 removed lines.
Original line number Diff line number Diff line 
**NOTE**: All examples in this template reference the rebase from Firefox 129.0a1 to 130.0a1, see the tor-browser `Rebase Browser - Rapid.md` template for further info



<details>

  <summary>Explanation of Variables</summary>



- `$(NIGHTLY_VERSION)`: the Mozilla defined nightly version, used in various places for building tor-browser tags, labels, etc

  - **Example**: `130.0a1`

- `$(NIGHTLY_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(NIGHTLY_VERSION)`

  - **Example**: `FIREFOX_NIGHTLY_130_END`

- `$(NIGHTLY_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous nightly version when rebasing (ie, the nightly version we are rebasing from)

  - **Example**: `FIREFOX_NIGHTLY_129_END`

- `$(BROWSER_VERSION)`: the browser version which will first be based on the next major ESR version this *Firefox* Nightly series is leading up to

  - **Example**: `15`

- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch based off of the Firefox Nightly channel

  - **Example**: `base-browser-130.0a1-15.0-2`

- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`

  - **Example**: `base-browser-130.0a1-15.0-2-build1`

- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch based off of the Firefox Nightly channel

  - **Example**: `base-browser-129.0a1-15.0-2`

- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`

  - **Example**: `base-browser-129.0a1-15.0-2-build1`

- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch

  - **Example**: `mullvad-browser-130.0a1-15.0-2`

- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch

  - **Example**: `mullvad-browser-129.0a1-15.0-2`

</details>



**NOTE**: It is presuemd the equivalent Tor Browser rapid-release rebase has been completed, as this rebase depends on a rebased `base-browser` branch



### Update Branch Protection Rules



- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/settings/repository):

  - [ ] Remove previous nightly `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)

  - [ ] Create new `mullvad-browser` branch protection rule:

    - **Branch**: `mullvad-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*`

      - **Example**: `mullvad-browser-130.0a1-15.0-*`

    - **Allowed to merge**: `Maintainers`

    - **Allowed to push and merge**: `Maintainers`

    - **Allowed to force push**: `false`

    - ⚠️ **IMPORTANT**: If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them!



### **Create and Push New Branch**



- [ ] Create new alpha `mullvad-browser` branch from this ESR's rapid `base-browser` tag

  - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`

  - **Example**: `git branch mullvad-browser-130.0a1-15.0-2 base-browser-130.0a1-15.0-2-build1`

- [ ] Push new `mullvad-browser` branch to `upstream`

- [ ] Push the `base-browser` tag to `upstream`



### **Rebase mullvad-browser**



- [ ] Checkout a new local branch for the `mullvad-browser` rebase

  - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-130.0a1-15.0-2`

- [ ] `mullvad-browser` rebase

  - [ ] Cherry-pick the previous `mullvad-browser` rapid branch's commit range

    - **Example**: `git cherry-pick base-browser-129.0a1-15.0-2-build1..mullvad-browser-129.0a1-15.0-2`

  - [ ] Rebase and autosquash these newly cherry-picked commits

    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-130.0a1-15.0-2`

  - [ ] Cherry-pick the new `mullvad-browser` alpha commits (i.e. the new dangling commits which did not appear in the previous Mullvad Browser rapid channel):

    - **Example** `git cherry-pick mullvad-browser-128.1.0esr-14.5-1-build1..upstream/mullvad-browser-128.1.0esr-14.5-1`

  - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.

    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-130.0a1-15.0-2`

- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:

  - [ ] diff of diffs:

    -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -

    - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`

    - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > rebased_patchset.diff`

    - diff `current_patchset.diff` and `rebased_patchset.diff`

      - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `mullvad-browser` branch)

  - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`

    - **Example**: `git range-diff base-browser-129.0a1-15.0-2-build1..upstream/mullvad-browser-129.0a1-15.0-2 base-browser-130.0a1-15.0-2-build1..HEAD`

- [ ] Open MR for the `mullvad-browser` rebase

- [ ] Merge



### **Sign and Tag**



- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:

  - In **mullvad-browser.git**, checkout the new rapid `mullvad-browser` branch

  - In **tor-browser-build.git**, run signing script:

    ```bash

    ./tools/browser/sign-tag.mullvadbrowser rapid build1

    ```

  - [ ] Push tag to `upstream`



/label ~"Apps::Type::Rebase"

.gitlab/issue_templates/Rebase Browser - Stable.md

deleted100644 → 0
+0 −89
Changes for .gitlab/issue_templates/Rebase Browser - Stable.md: 0 added lines, 89 removed lines.
Original line number Diff line number Diff line 
**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr



<details>

  <summary>Explanation of Variables</summary>



- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc

  - **Example**: `102.8.0`

- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`

  - **Example**: `FIREFOX_102_8_0esr_RELEASE`

- `$(BROWSER_MAJOR)`: the browser major version

  - **Example**: `12`

- `$(BROWSER_MINOR)`: the browser minor version

  - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`

- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch

  - **Example**: `base-browser-102.8.0esr-12.0-1`

- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch

  - **Example**: `base-browser-102.7.0esr-12.0-1`

- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`

  - **Example**: `base-browser-102.8.0esr-12.0-1-build1`

- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`

  - **Example**: `base-browser-102.7.0esr-12.0-1-build1`

- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch

  - **Example**: `mullvad-browser-102.8.0esr-12.0-1`

- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch

  - **Example**: `mullvad-browser-102.7.0esr-12.0-1`

</details>



**NOTE:** It is assumed that we've already rebased and tagged `base-browser` stable



### **Bookkeeping**



- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Apps%3A%3AType%3A%3AReleasePreparation) issue.



### Update Branch Protection Rules



- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/settings/repository):

  - [ ] Remove previous stable `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)

  - [ ] Create new `mullvad-browser` branch protection rule:

    - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`

      - **Example**: `mullvad-browser-102.8.0esr-12.0-1*`

    - **Allowed to merge**: `Maintainers`

    - **Allowed to push and merge**: `Maintainers`

    - **Allowed to force push**: `false`



### **Create and Push New Branch**



- [ ] Create new stable `mullvad-browser` branch from this ESR's stable `base-browser` tag

  - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`

  - **Example**: `git branch mullvad-browser-102.8.0esr-12.0-1 base-browser-102.8.0esr-12.0-1-build1`

- [ ] Push new `mullvad-browser` branch to `upstream`

- [ ] Push `base-browser` tag to `upstream`

- [ ] Push `$(ESR_TAG)` to `upstream`



### **Rebase mullvad-browser**



- [ ] Checkout a new local branch for the `mullvad-browser` rebase

  - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.0-1`

- [ ] `mullvad-browser` rebase

  - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag

    - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..mullvad-browser-102.7.0esr-12.0-1-build1`

  - [ ] Rebase and autosquash these newly cherry-picked commits

     - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.0-1`

  - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag

    - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.0-1`

  - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting.

    - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.0-1`

- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:

  - [ ] diff of diffs:

    -  Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -

    - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`

    - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > rebased_patchset.diff`

    - diff `current_patchset.diff` and `rebased_patchset.diff`

      - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `mullvad-browser` branch)

  - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`

    - **Example**: `git range-diff base-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`

- [ ] Open MR for the `mullvad-browser` rebase

- [ ] Merge



### **Sign and Tag**



- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:

  - In **mullvad-browser.git**, checkout the new stable `mullvad-browser` branch

  - In **tor-browser-build.git**, run signing script:

    ```bash

    ./tools/browser/sign-tag.mullvadbrowser stable build1

    ```

  - [ ] Push tag to `upstream`



/label ~"Apps::Type::Rebase"