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

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 2 commits: fixup! Bug 41649: Create rebase and security backport gitlab issue templates

Title: GitLab

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • 0a8b54dc
    by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00 
    fixup! Bug 41649: Create rebase and security backport gitlab issue templates

Add a step to make the default branch and add how to find a tag when it
does not exist yet.
  • bbfe9bf0
    by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00 
    fixup! Adding issue and merge request templates

Do not assign to new issue to nah anymore

2 changed files:

Changes:

  • .gitlab/issue_templates/Rebase Browser - Alpha.md
    ... ... @@ -39,10 +39,21 @@
    39 39 
         - **Allowed to merge**: `Maintainers`
    40 40 
         - **Allowed to push and merge**: `Maintainers`
    41 41 
         - **Allowed to force push**: `false`
    42 
    +    - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them!
    42 43
    43 44 
     ### **Create New Branches**
    44 45
    45 
    -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase)
    46 
    +- [ ] Find the Firefox mercurial tag `$(ESR_TAG)`
    47 
    +  - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release
    48 
    +  - Otherwise:
    49 
    +    - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags`
    50 
    +    - [ ] Find and inspect the commit tagged with `$(ESR_TAG)`
    51 
    +      - Tags are in yellow in the Mercurial web UI
    52 
    +    - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)`
    53 
    +      - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`)
    54 
    +      - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead
    55 
    +    - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"`
    56 
    +- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag
    46 57 
       - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
    47 58 
       - **Example**: `base-browser-102.8.0esr-12.5-1`
    48 59 
     - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag
    ... ... @@ -111,6 +122,11 @@
    111 122 
     - Update and push `base-browser` branch
    112 123 
       - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch
    113 124 
       - [ ] Push these commits to `upstream`
    125 
    +- [ ] Set `$(TOR_BROWSER_BRANCH)` as the default GitLab branch
    126 
    +  - [ ] Go to [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repository)
    127 
    +  - [ ] Expand `Branch defaults`
    128 
    +  - [ ] Set the branch and leave the `Auto-close` checkbox unchecked
    129 
    +  - [ ] Save changes
    114 130
    115 131 
     ### **Sign and Tag**
    116 132

  • .gitlab/issue_templates/UXBug.md deleted
    1 
    -<!--
    2 
    -* Use this issue template for reporting a new UX bug.
    3 
    --->
    4 
    -
    5 
    -### Summary
    6 
    -**Summarize the bug encountered concisely.**
    7 
    -
    8 
    -
    9 
    -### Steps to reproduce:
    10 
    -**How one can reproduce the issue - this is very important.**
    11 
    -
    12 
    -1. Step 1
    13 
    -2. Step 2
    14 
    -3. ...
    15 
    -
    16 
    -### What is the current bug behavior?
    17 
    -**What actually happens.**
    18 
    -
    19 
    -
    20 
    -### What is the expected behavior?
    21 
    -**What you want to see instead**
    22 
    -
    23 
    -
    24 
    -
    25 
    -## Relevant logs and/or screenshots
    26 
    -**Do you have screenshots? Attach them to this ticket please.**
    27 
    -
    28 
    -/label ~tor-ux ~needs-investigation ~bug
    29 
    -/assign @nah

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits