Skip to content

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

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

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

Conversation

@pull
Copy link
Copy Markdown

@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
renovate bot and others added 28 commits March 20, 2026 15:50
@renovate
Update dependency aws-sdk-core to v3.244.0 (mastodon#38289)
ec5a0de 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.217.0 (mastodon#38290)
6a2274b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency test-prof to v1.6.0 (mastodon#38291)
67864ef 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ioredis to v5.10.1 (mastodon#38299)
4ecd75f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@diondiondion
Add simple language selector to collection editor (mastodon#38316)
806f4f1
@mjankowski
Use Mention arel/exist in report service scope build-out (mastodon#38300
4e276e4 
)
@ClearlyClaire
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-s…
469076c 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Profile editing: Use server flag
00a423e 
Port 00bcb01 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Profile tab settings
781491e 
Port 6507a61 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Implements tag suggestions for collections topic field
784f016 
Port 8bce0b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Add simple language selector to collection editor
b47f225 
Port 806f4f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3453 from glitch-soc/glitch-soc/merge-upstream
c43f44e 
Merge upstream changes up to 4e276e4
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#38321)
34a52fd 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency jsdom to v29.0.1 (mastodon#38304)
e13d57a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use progress total tracker in accounts CLI (mastodon#38296)
bd16e3f
@ChaosExAnima
Profile redesign: Nudge to add featured tags (mastodon#38315)
931da0c
@ClearlyClaire
Refactor ProcessMentionsService to remove save_records parameter (m…
21576e2 
…astodon#38277)
@renovate
Update Yarn to v4.13.0 (mastodon#38305)
13bfd2f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency flatware-rspec to v2.4.0 (mastodon#38327)
506d0af 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Change media description length limit for remote media attachments fr…
d48470a 
…om 1500 to 10000 characters (mastodon#37921)
@renovate @ChaosExAnima
Update dependency vite to v8 (mastodon#38174)
1935f4d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
@ClearlyClaire
Tag linked FeaturedCollection objects over ActivityPub (mastodon#38115)
39d9da3
@oneiros
Allow service to update existing Collections (mastodon#38329)
3c47020
@mjankowski
Add tagged_objects to reblog section of status association cache (m…
fca25fa 
…astodon#38334)
@mjankowski
Extract common lists for status/reblog preload/cacheable (mastodon#35285
5a7c565 
)
@oneiros
Handle Update of a FeaturedCollection (mastodon#38337)
e4e584a
@mjankowski
Fix Layout/EmptyLineAfterGuardClause cop in `PollExpirationNotifyWo…
6e281e8 
…rker` (mastodon#38331)
@mjankowski
Use matches_uri_prefix in followers hash method (mastodon#38332)
9909c74
ChaosExAnima and others added 30 commits April 2, 2026 14:47
@ChaosExAnima
Profile redesign: Add alt to avatar and header (mastodon#38532)
59299c6
@diondiondion
Use compact buttons in collection account list (mastodon#38543)
7e6813e
@shleeable
fix: webfinger is not declared as an attribute in actor_serializer.rb (…
fdce2d3 
…mastodon#38538)
@ChaosExAnima
Profile redesign: Split fields row when evenly sized (mastodon#38544)
dc923c6
@mjankowski
Use approvable concern for repeated API approve/reject routes (mast…
47f5821 
…odon#38542)
@ClearlyClaire
Merge pull request #3465 from glitch-soc/glitch-soc/merge-upstream
ff18860 
Merge upstream changes up to ffcf87e
@ClearlyClaire
Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-s…
cb62bec 
…oc/merge-upstream
@ChaosExAnima @diondiondion @ClearlyClaire
[Glitch] Profile redesign: Account featured tab
9758c59 
Port 8da2fae to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Make padding consistent with main timeline
baa253c 
Port 145dcfa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix regressions in notifications caused by rendering default…
1505cdd 
… translation wrapper element

Port 8afca67 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Update collection account list design
b43005a 
Port 225069d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Make description optional in collection editor
6b8b43b 
Port caf7c21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Move and rearrange number fields
ed14c03 
Port f7c00d8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix being unable to disable sound for quote update notification
4028172 
Port 954cc92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Remove collections client-side feature flag
093858e 
Port f90f1e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Add alt to avatar and header
de57fec 
Port 59299c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Use compact buttons in collection account list
a63744e 
Port 7e6813e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Split fields row when evenly sized
ce157ca 
Port dc923c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3466 from glitch-soc/glitch-soc/merge-upstream
3c0f43b 
Merge upstream changes up to dc923c6
@github-actions @web-flow
New Crowdin translations (#3446)
93e7a33 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Use "batch" concern in admin routes (mastodon#38551)
671568a
@mjankowski
Use rubocop --format github instead of problem matcher (mastodon#38519
83ac897 
)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#38553)
627023b 
Co-authored-by: GitHub Actions <noreply@github.com>
@ChaosExAnima
Profile redesign: Adds a "Follows you" badge (mastodon#38549)
759e97f
@mjankowski
Use collection partial for "software updates" list in admin area (mas…
ee69290 
…todon#38550)
@mjankowski @brendanjones
Clarify that language filter does not impact home/lists (mastodon#38490)
621628e 
Co-authored-by: Brendan Jones <16049594+brendanjones@users.noreply.github.com>
@mjankowski
Use partial to render settings/featured_tags (mastodon#36174)
8fa91b4
@ClearlyClaire
Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-s…
da85a16 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Profile redesign: Adds a "Follows you" badge
c6f9a60 
Port 759e97f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3468 from glitch-soc/glitch-soc/merge-upstream
577a327 
Merge upstream changes up to 8fa91b4
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.

10 participants

@diondiondion @mjankowski @ClearlyClaire @ChaosExAnima @oneiros @Gargron @andypiper @MitarashiDango @mkljczk @shleeable