MokoConsulting/MokoGitea-Fork
1
0
Fork 0
Code Issues 146 Pull Requests Releases 96 Wiki Activity

chore(sync): cascade main -> dev #776

Merged
jmiller merged 4 commits from main into dev 2026-07-13 00:47:32 +00:00
Conversation 0 Commits 4 Files Changed 3
+68 -25
jmiller commented 2026-07-13 00:47:19 +00:00
Owner
Copy Link
Copy Source

Automated cascade of main into dev. Auto-merges only if conflict-free; otherwise left open for manual resolution.

Automated cascade of main into dev. Auto-merges only if conflict-free; otherwise left open for manual resolution.
jmiller added 4 commits 2026-07-13 00:47:20 +00:00
fix(branding): app icon follows the Nav Icon upload
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 38s
Details
Universal: Build & Release / Promote to RC (pull_request) Failing after 9s
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Has been skipped
Details
Generic: Project CI / Lint & Validate (pull_request) Has been cancelled
Details
Generic: Project CI / Tests (pull_request) Has been cancelled
Details
PR RC Release / Build RC Release (pull_request) Has been cancelled
Details
Universal: PR Check / Branch Policy (pull_request) Has been cancelled
Details
Universal: PR Check / Require Docs Update (pull_request) Has been cancelled
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Has been cancelled
Details
Universal: PR Check / Secret Scan (pull_request) Has been cancelled
Details
Universal: PR Check / Validate PR (pull_request) Has been cancelled
Details
Generic: Repo Health / Access control (pull_request) Has been cancelled
Details
Generic: Repo Health / Site Health (pull_request) Has been cancelled
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Scripts Governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Repository Health (pull_request) Has been cancelled
Details
3d0cb7d98c 
The app icon (logo.png) is the PWA/web-manifest icon and the navbar
fallback, but had no Branding control, so it stayed the shipped default
even on a fully branded instance. Uploading the Nav Icon now also writes
logo.png (single io.MultiWriter pass), and resetting the Nav Icon reverts
both to the built-in default.

Closes #773
refactor(branding): write each icon target independently on upload
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 32s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Has been skipped
Details
PR RC Release / Build RC Release (pull_request) Successful in 24s
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 34s
Details
Generic: Project CI / Tests (pull_request) Successful in 34s
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Successful in 2s
Details
Universal: PR Check / Validate PR (pull_request) Successful in 7s
Details
Generic: Repo Health / Access control (pull_request) Successful in 2s
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Universal: PR Check / Require Docs Update (pull_request) Failing after 25s
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 26s
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Scripts Governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Repository Health (pull_request) Has been cancelled
Details
f4be31183f 
Rewind the uploaded stream between targets and write/close each file in
turn instead of a shared io.MultiWriter, so a failure writing a later
target (e.g. logo.png) can never leave an earlier one (logo-small.png)
truncated. Addresses review feedback on #774.
Merge remote-tracking branch 'origin/main' into fix/app-icon-follows-nav-icon
Generic: Project CI / Lint & Validate (pull_request) Successful in 33s
Details
Generic: Project CI / Tests (pull_request) Successful in 39s
Details
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Failing after 1m41s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
PR RC Release / Build RC Release (pull_request) Successful in 1m10s
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 2s
Details
Universal: PR Check / Require Docs Update (pull_request) Failing after 43s
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Successful in 1s
Details
Universal: PR Check / Validate PR (pull_request) Successful in 7s
Details
Generic: Repo Health / Access control (pull_request) Successful in 1s
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 30s
Details
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Has been skipped
Details
Branch Cleanup / Delete merged branch (pull_request) Successful in 1s
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Failing after 1m54s
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Scripts Governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Report: Repository Health (pull_request) Has been cancelled
Details
dc14a3fcfc 
# Conflicts:
#	CHANGELOG.md
Merge pull request 'fix(branding): app icon follows the Nav Icon upload (#773)' (#774) from fix/app-icon-follows-nav-icon into main
Cascade Main -> Dev / Cascade main -> dev (push) Successful in 3s
Details
Generic: Project CI / Lint & Validate (pull_request) Successful in 28s
Details
PR RC Release / Build RC Release (pull_request) Successful in 2s
Details
Generic: Project CI / Tests (pull_request) Successful in 29s
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 2s
Details
Universal: PR Check / Require Docs Update (pull_request) Has been skipped
Details
Universal: PR Check / Wiki Update Reminder (pull_request) Has been skipped
Details
Universal: PR Check / Validate PR (pull_request) Successful in 8s
Details
Branch Cleanup / Delete merged branch (pull_request) Has been skipped
Details
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 41s
Details
Deploy MokoGitea / deploy (push) Successful in 5m3s
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
3ce6fd3e08
jmiller scheduled this pull request to auto merge when all checks succeed 2026-07-13 00:47:21 +00:00
jmiller merged commit ada91a9bc1 into dev 2026-07-13 00:47:32 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
breaking-change
Breaking API or behavior change
 ci-cd
CI/CD pipeline changes
 config
Configuration changes
 dependencies
Dependency updates
 deploy-failure
Deployment failed
 docker
Docker/container changes
 documentation
Documentation changes
 feature: wiki
Wiki system enhancements
 good first issue
Good for newcomers
 health-check
Repo health check result
 help wanted
Extra attention needed
 mokostandards
Related to MokoStandards framework
 push-failure
Git push operation failed
 security
Security vulnerability or hardening
 size/l
200-500 lines changed
 size/m
50-200 lines changed
 size/s
10-50 lines changed
 size/xl
500+ lines changed
 size/xs
< 10 lines changed
 standards-drift
Deviates from MokoStandards
 standards-update
MokoStandards compliance update
 sync-failure
Sync or mirror failed
 tech-debt
Technical debt and TODO/FIXME items
 upstream
upstream
Inherited from upstream Gitea
 work-in-progress
Draft or incomplete work
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Priority -
Type -
Milestone
No items
No Milestone
Assignees
Clear assignees
jmiller (Jonathan Miller) moko-deploy (Moko Deploy Bot)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MokoConsulting/MokoGitea-Fork#776
Delete Branch "main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?