[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! BB 43615: Add Gitlab Issue and Merge Request templates

Title: GitLab

Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • 69e76487
    by Dan Ballard at 2026-03-03T09:21:29-08:00 
    fixup! BB 43615: Add Gitlab Issue and Merge Request templates

TB 44703: Updating rebase alpha template with recent 148 experience

1 changed file:

Changes:

  • .gitlab/issue_templates/060 Rebase - Alpha.md
    ... ... @@ -13,7 +13,7 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl
    13 13 
     - Rebase application-services
    14 14 
       - uniffi-rs
    15 15 
         - Prepare the rebase
    16 
    -      - [ ] Verify if application-services has updated it's uniffi-rs version
    16 
    +      - [ ] Verify if application-services has updated it's uniffi-rs version else skip this step
    17 17 
           - [ ] Get the [upstream](https://github.com/mozilla/uniffi-rs) tag
    18 18 
           - [ ] Freeze the current default branch
    19 19 
           - [ ] Create the target branch (`X.XX.X`)
    ... ... @@ -45,10 +45,11 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl
    45 45 
       - Prepare the rebase
    46 46 
         - [ ] Get the [Firefox](https://github.com/mozilla-firefox/firefox) tag
    47 47 
       - Do the rebase [Part 1]
    48 
    -    - [ ] Create the target branch (`tor-browser-...-1`)
    49 
    -    - [ ] Cherry-pick commits until `tor-browser-...-build1`
    48 
    +    - [ ] Create the target branch (`tor-browser-XXX.0a1-YY.0-1`)
    49 
    +    - [ ] Cherry-pick commits until `tor-browser-(XXX - 1).0a1-YY.0-2-build1`
    50 
    +    - Optional: If your first rebase, complex, or difficult, can do an MR here for feedback.
    50 51 
         - [ ] Freeze the current default branch
    51 
    -    - [ ] Cherry-pick remaining commits
    52 
    +    - [ ] Cherry-pick remaining commits (rest of tor-browser-(XXX - 1)a1-YY.Y-2)
    52 53 
         - Merge
    53 54 
           - [ ] Perform a self-review (`git range-diff`)
    54 55 
           - [ ] Run linters
    ... ... @@ -62,10 +63,14 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl
    62 63 
           - [ ] Make `tor-browser-...-1` the default branch and freeze it
    63 64 
       - Do the rebase [Part 2]
    64 65 
         - [ ] Create the target branch (`tor-browser-...-2`)
    65 
    -    - [ ] Cherry-pick commits until `tor-browser-...-1-build1`
    66 
    +    - [ ] Cherry-pick commits until `tor-browser-XXX...-1-build1`
    66 67 
         - [ ] Squash (`git rebase --autosquash FIREFOX_...`)
    67 68 
         - [ ] Cherry-pick the remaining commits
    68 69 
         - [ ] Reorder commits
    70 
    +      - [ ] Move Mozilla "Bug ZZZZZZZZ" issues to the very start
    71 
    +      - [ ] Move any Base Browser "BB TTTTT" issues into the BB range
    72 
    +      - [ ] Move `--fixups` next to their parent (`git rebase -i --autosquash FIREFOX_...` then change all the `fixup` to `pick`)
    73 
    +        - Note: also `drop` any commits marked `!dropme`
    69 74 
         - Merge
    70 75 
           - [ ] Perform a self-review (`git range-diff` + diff of diffs)
    71 76 
           - [ ] Run linters

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69e764878411b08bb8d073420574cd45a50b3f4f at 1772558552 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx