[tbb-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

[richard (@richard)]

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:

- .gitlab/issue_templates/Rebase Browser - Alpha.md
- − .gitlab/issue_templates/UXBug.md


Changes:

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


=====================================
.gitlab/issue_templates/UXBug.md deleted
=====================================
@@ -1,29 +0,0 @@
-<!--
-* Use this issue template for reporting a new UX bug.
--->
-
-### Summary
-**Summarize the bug encountered concisely.**
-
-
-### Steps to reproduce:
-**How one can reproduce the issue - this is very important.**
-
-1. Step 1
-2. Step 2
-3. ...
-
-### What is the current bug behavior?
-**What actually happens.**
-
-
-### What is the expected behavior?
-**What you want to see instead**
-
-
-
-## Relevant logs and/or screenshots
-**Do you have screenshots? Attach them to this ticket please.**
-
-/label ~tor-ux ~needs-investigation ~bug
-/assign @nah



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd03624cef03b97b2451034e40ada932741848d2...bbfe9bf08ba9956f0fc92f9eaa3ea7da68b52a7e

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd03624cef03b97b2451034e40ada932741848d2...bbfe9bf08ba9956f0fc92f9eaa3ea7da68b52a7e
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230915/9b5df3c0/attachment-0001.htm>