Skip to content

Improve merge review and branch management for 2.1.1 - #21

Merged
hsxk merged 45 commits into
masterfrom
feat/2.1.1-review-branch-management
Oct 3, 2026
Merged

hsxk merged 45 commits into
masterfrom
feat/2.1.1-review-branch-management

Conversation

@hsxk

@hsxk hsxk commented Sep 28, 2026 •

Copy link
Copy Markdown
Owner

Small-release UX, review, privacy, and branch-management improvements built on top of the 2.1 three-way merge model.

Merge review

  • Shows readable Base / Original / Branch values for menu order, comment/ping status, and masked post-password state.
  • Resolves changed taxonomy term IDs to readable term names.
  • Shows featured-image identity and thumbnail previews when available.
  • Keeps arbitrary custom-meta values private; only changed keys remain listed.
  • Uses WordPress core localization for readable Open / Closed status values.

Branch management

  • Existing branch cards show branch ID, creator, modified date/time, state, change count, and conflict count.
  • Branch rows identify the original by post ID and, only when readable by the current user, title.
  • Adds dedicated Existing branches views to Posts and Pages list tables.
  • Keeps list filtering/counts aligned with author capabilities and supports current plus legacy branch relationships.

Security and privacy hardening

  • Prevents unreadable private original titles from leaking through branch list states.
  • Keeps password values masked in REST review data.
  • Keeps arbitrary custom-meta values out of the readable REST comparison.
  • Explicitly scopes Existing branches for users without edit_others_posts.

Validation

  • Real WordPress integration: 130 / 130 checks.
  • Compatibility matrix: WordPress 6.6 / PHP 8.2, WordPress 7.1.1 / PHP 8.2, WordPress 7.1.1 / PHP 8.4.
  • Real Gutenberg Chromium E2E: 42 / 42 checks.
  • Semantic UI/tutorial contract: 35 / 35 cases.
  • PHP 8.2 / 8.3 / 8.4 syntax and WordPress Coding Standards.
  • JavaScript/CSS lint, deterministic editor build, deterministic translations, WordPress Plugin Check, and release ZIP audit.
  • Release-tree checks exclude development hidden files.

Release metadata is now advanced to 2.1.1. The release tag and WordPress.org deployment will only be created after this release commit passes the complete validation matrix and is merged to master.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 422f5b5448

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread includes/class-admin.php Outdated
@hsxk
hsxk merged commit ee36bc5 into master Oct 3, 2026
11 checks passed
@hsxk
hsxk deleted the feat/2.1.1-review-branch-management branch October 3, 2026 01:17
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