morgan pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • .gitlab/merge_request_templates/default.md
    ... ... @@ -35,12 +35,12 @@
    35 35
     
    
    36 36
     #### Timeline
    
    37 37
     - [ ] **No Backport (preferred)**: patchset for the next major stable
    
    38
    -- [ ] **Immediate**: patchset needed as soon as possible
    
    38
    +- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
    
    39 39
     - [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
    
    40 40
     - [ ] **Eventually**: patchset that needs to be verified in alpha before backport
    
    41 41
     
    
    42 42
     #### (Optional) Justification
    
    43
    -- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
    
    43
    +- [ ] **Security update**: patchset contains a security fix (be sure to select the correct item in _Timeline_)
    
    44 44
     - [ ] **Censorship event**: patchset enables censorship circumvention
    
    45 45
     - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
    
    46 46
     - [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc