Skip to content
/ mastodon Public
forked from glitch-soc/mastodon

[pull] main from glitch-soc:main#523

Open
pull[bot] wants to merge 1625 commits intoCompostInTraining:mainfrom
glitch-soc:main
Open

[pull] main from glitch-soc:main#523
pull[bot] wants to merge 1625 commits intoCompostInTraining:mainfrom
glitch-soc:main

Conversation

@pull
Copy link

@pull pull bot commented Sep 25, 2025 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot locked and limited conversation to collaborators Sep 25, 2025
@pull pull bot added the ⤵️ pull label Sep 25, 2025
ClearlyClaire and others added 28 commits February 6, 2026 22:45
@ClearlyClaire
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-s…
8f58c42 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Show mute end date in badge
351b8a7 
Port 7a4945c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@shimon1024 @ClearlyClaire
[Glitch] Enable coexistence of horizontal and vertical posts
425d411 
Port 96de28d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Add new components Combobox and EmptyState
9eb7188 
Port 2768ab7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Move account search into hook
8caaffe 
Port 7e27ba9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @diondiondion @ClearlyClaire
[Glitch] Profile redesign: Pinned posts
69f0c52 
Port 2e30044 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3388 from ClearlyClaire/glitch-soc/merge-upstream
fee8a4f 
Merge upstream changes up to 2e30044
@renovate
Update dependency postcss-preset-env to v11.1.3 (mastodon#37758)
08003ba 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency oj to v3.16.15 (mastodon#37757)
1dbf69d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency dotenv to v17.2.4 (mastodon#37753)
08f9af9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @types/react to v18.3.28 (mastodon#37777)
77bc8f7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#37767)
6ec4bd5 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Use bundler version 4.0.6 (mastodon#37745)
3f845e6
@oneiros
Pin Actions to SHA (mastodon#37764)
b9a538e
@ClearlyClaire
Refactor store_current_location before_action in `OAuth::Authoriz…
d3cef82 
…ationsController` (mastodon#37779)
@ClearlyClaire
Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-s…
47b0e78 
…oc/merge-upstream
@ChaosExAnima
Fix: Changes to pins update immediately (mastodon#37765)
b4fb256
@renovate
Update actions/checkout action to v6 (mastodon#37782)
c0f809c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update actions/cache action to v5 (mastodon#37781)
624c25e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update peter-evans/create-pull-request action to v8 (mastodon#37783)
c1b9454 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update twk3/rollup-size-compare-action action to v1.2.0 (mastodon#37787)
da91639 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update artifact actions (major) (major) (mastodon#37788)
665f746 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@sneakers-the-rat
Change: Consolidate collection handling in jsonld helper (mastodon#34595
e17bbed 
)
@mjankowski
Use validation matchers for ExistingUsernameValidator spec (mastodo…
0b8ce72 
…n#37749)
@ClearlyClaire
Merge pull request #3390 from ClearlyClaire/glitch-soc/merge-upstream
387b9af 
Merge upstream changes up to d3cef82
@ClearlyClaire
Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-s…
c8db60f 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Fix: Changes to pins update immediately
455fa54 
Port b4fb256 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap
Add a i18n check in pre-commit for JS files (mastodon#37793)
837d1de
oneiros and others added 30 commits February 24, 2026 14:22
@oneiros
Refactor: Introduce admin base action class (mastodon#37960)
72406a1
@diondiondion
Add collection report modal (mastodon#37961)
919b1e6
@ClearlyClaire
Merge pull request #3420 from ClearlyClaire/glitch-soc/merge-upstream
c857c91 
Merge upstream changes up to 1e87bd1
@oneiros
Split status batch and moderation actions (mastodon#37970)
e2c9426
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#37968)
953472b 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Remove references to removed prettier config files (mastodon#37962)
32873e6
@diondiondion
Display public collections on profile "Featured tab" (mastodon#37967)
440466c
@ClearlyClaire
Fix username availability check being wrongly applied on race conditi…
ea34d35 
…ons (mastodon#37975)
@oneiros
Add moderation consequences for collections (mastodon#37974)
f9326ef
@ChaosExAnima
Profile redesign: Account fields grid (mastodon#37976)
dcbf7ab
@ClearlyClaire
Fix profile redesign profile fields gap (mastodon#37979)
4d2a148
@ClearlyClaire
Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-s…
e3cb4de 
…oc/merge-upstream
@diondiondion @ClearlyClaire
[Glitch] Add collection report modal
83b4a78 
Port 919b1e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Display public collections on profile "Featured tab"
ae6dbbc 
Port 440466c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix username availability check being wrongly applied on rac…
f6d6dc2 
…e conditions

Port ea34d35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Account fields grid
7c631b9 
Port dcbf7ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix profile redesign profile fields gap
2a60f6f 
Port 4d2a148 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3421 from ClearlyClaire/glitch-soc/merge-upstream
b2d10ea 
Merge upstream changes up to 4d2a148
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#37985)
970ac04 
Co-authored-by: GitHub Actions <noreply@github.com>
@oneiros
Allow remote accounts in Collections (mastodon#37989)
51b81b3
@ChaosExAnima
Profile editing: Utilize new API (mastodon#37990)
d18a47b
@ClearlyClaire
Add max_note_length and max_display_name_length to `configuration…
951a42f 
….accounts` in `Instance` entity (mastodon#37991)
@oneiros
Federate activity when remote account is added to a Collection (masto…
b09e63d 
…don#37992)
@mjankowski
Use validation matchers for DisallowedHashtagValidator spec (mastod…
5026bf6 
…on#37636)
@ClearlyClaire
Add featured_tags to GET /api/v1/profile (mastodon#37932)
9c4d11f
@ChaosExAnima
Profile redesign: Fix fields in Chromium (mastodon#37996)
bca5702
@ClearlyClaire
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-s…
dc27ecc 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Profile editing: Utilize new API
49bed14 
Port d18a47b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Fix fields in Chromium
836c417 
Port bca5702 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3422 from ClearlyClaire/glitch-soc/merge-upstream
36c0f37 
Merge upstream changes up to bca5702
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.