Skip to content

chore: synchronize master hotfixes back into development - #383

Merged
RealizmModz merged 10 commits into
developmentfrom
master
Sep 26, 2026
Merged

RealizmModz merged 10 commits into
developmentfrom
master

Conversation

@RealizmModz

Copy link
Copy Markdown
Collaborator

Synchronizes the production branch back into the integration branch before cutting a replacement release.

Why:

  • PR Superseded: Release UI polish and iOS simulator gate #367 is now stale as a release candidate.
  • development and master have diverged.
  • master contains 10 release/hotfix commits not present in development, including Android artifact promotion, vulnerability-disclosure policy, identity hardening releases, and production network/exposure hotfixes.
  • development contains newer AI/security/UI work that must not overwrite or silently drop those production-only commits.

This PR intentionally changes no release scope by itself. It first restores branch ancestry so the next development -> master release candidate can be reviewed and validated from one synchronized history.

Do not deploy from this PR.

Promote personalization, readability, and external auth to master
Promote branch cleanup and current handoff to master
Promote Android internal-test APK pipeline to master
Promote pull-request Android APK artifacts to master
Promote FullWorth hardening for next production release
Release: identity registration and recovery hardening
* Fix production Redis and edge network transition

* Reconcile database networking before backup

* Preserve backup gate during stopped-runtime recovery

* Regress production transition recovery

* Preserve Redis password expansion inside container

* Require container-side Redis password expansion

* Lock Redis double-dollar regression

* Update edge proxy regression for transition-safe subnets
* Ignore Docker inspect blank network lines

* Mirror Docker network output whitespace in regression

Copy link
Copy Markdown
Collaborator Author

Merge-method note: this synchronization PR must use a normal merge commit, not squash/rebase. The purpose is to make the current master history an ancestor of development; squashing would copy content but leave the long-lived branches historically diverged.

@RealizmModz
RealizmModz merged commit eaac4a4 into development Sep 26, 2026
26 checks passed

This branch was successfully deployed

1 active deployment
production — 7e8571a2 Deployed Sep 26, 2026 by RealizmModz via Guarded production deploy #7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant