Skip to content

Commit dcce9ae

Browse files
committed
Merge trunk into add/reader branch
Resolved merge conflicts: - includes/functions.php: Added Mention type handling from trunk - includes/rest/class-inbox-controller.php: Updated get_local_recipients to use Following::get_follower_ids for public activities - package.json: Merged dependency updates from trunk with Reader UI deps - package-lock.json: Regenerated with npm install
2 parents 905f70f + e3220cc commit dcce9ae

File tree

100 files changed

+4451
-1174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+4451
-1174
lines changed

.claude/skills/activitypub-pr-workflow/SKILL.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ try/{idea} # Experimental ideas.
3535
git checkout -b add/new-feature
3636

3737
# Create PR with GitHub CLI.
38-
gh pr create --assignee @me --reviewer Fediverse
38+
gh pr create --assignee @me --reviewer Automattic/fediverse
3939

4040
# Check PR status and CI.
4141
gh pr status
@@ -74,6 +74,8 @@ The repository uses Jetpack Changelogger for automated changelog generation.
7474

7575
Every PR template (`.github/PULL_REQUEST_TEMPLATE.md`) includes changelog fields:
7676

77+
**CRITICAL:** You must use the exact template markup from `.github/PULL_REQUEST_TEMPLATE.md`. Do not create custom formatting - use the actual checkboxes `- [x]` and `<details>` sections exactly as shown in the template.
78+
7779
1. **Check "Automatically create a changelog entry" checkbox**
7880
2. **Select Significance:** Patch/Minor/Major
7981
3. **Select Type:** Added/Changed/Deprecated/Removed/Fixed/Security

.distignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.DS_Store
66
.editorconfig
77
.git
8+
.gitattributes
89
.github
910
.gitignore
1011
.githooks

.github/changelog/2330-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2439-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2460-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2461-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2463-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2471-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2473-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/changelog/2494-from-description

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)