Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • .gitlab/merge_request_templates/default.md
    1
    +## Merge Info
    
    2
    +
    
    3
    +<!-- Bookkeeping information for release management -->
    
    4
    +
    
    5
    +- ### Related Issues
    
    6
    +  - tor-browser#xxxxx
    
    7
    +  - tor-browser-build#xxxxx
    
    8
    +  - etc
    
    9
    +
    
    10
    +- ### Backport Timeline
    
    11
    +  - [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
    
    12
    +  - [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport
    
    13
    +  - [ ] **Eventually** - patchset that needs to be verified in alpha before backport
    
    14
    +  - [ ] **No Backport** - patchset for the next major stable
    
    15
    +
    
    16
    +- ### Upstream Merging
    
    17
    +  - [ ] Merge to `base-browser` - typically for `!fixups` to patches in the `base-browser` branch, though sometimes new patches as well
    
    18
    +    - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please please make separate merge requests for each part
    
    19
    +
    
    20
    +- ### Issue Tracking
    
    21
    +  - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Release%20Prep&first_page_size=20) for changelog generation
    
    22
    +
    
    23
    +## Change Description
    
    24
    +
    
    25
    +<!-- Whatever context the reviewer needs to effectively review the patchset -->
    \ No newline at end of file