morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • .gitlab/merge_request_templates/default.md
    ... ... @@ -19,7 +19,7 @@
    19 19
     <!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged -->
    
    20 20
     
    
    21 21
     #### Target Branches
    
    22
    -  - [ ] **`main`**: esr128-14.5
    
    22
    +  - [ ] **`main`**: esr140-15.0
    
    23 23
       - [ ] **`maint-14.5`**: esr128-14.5
    
    24 24
       - [ ] **`maint-13.5`**: esr115-13.5
    
    25 25
     
    
    ... ... @@ -50,7 +50,7 @@
    50 50
     #### Request Reviewer
    
    51 51
     
    
    52 52
     - [ ] Request review from an applications developer depending on modified system:
    
    53
    -  - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
    
    53
    +  - **NOTE**: if the MR modifies multiple areas, please `/request_review` all the relevant reviewers
    
    54 54
       - **accessibility** : henry
    
    55 55
       - **android** : clairehurst, dan
    
    56 56
       - **build system** : boklm
    

  • .gitlab/merge_request_templates/relprep.md
    ... ... @@ -52,7 +52,7 @@
    52 52
     
    
    53 53
     #### Request Reviewer
    
    54 54
     
    
    55
    -- [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov
    
    55
    +- [ ] Request review from release engineers: boklm, dan, ma1, morgan, pierov
    
    56 56
     
    
    57 57
     #### Change Description
    
    58 58