Skip to content

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

Open
pull[bot] wants to merge 2613 commits into
CompostInTraining:mainfrom
glitch-soc:main
Open

[pull] main from glitch-soc:main#523
pull[bot] wants to merge 2613 commits into
CompostInTraining: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
mjankowski and others added 28 commits April 17, 2026 08:09
@mjankowski
Include hosts resolver in request socket DNS lookup (mastodon#38699)
d5f0e37
@mjankowski
Pull user settings defaults from configuration (mastodon#38592)
3411d06
@diondiondion
Remove "View other collections from this user" from collection menu (m…
e571994 
…astodon#38728)
@diondiondion
Allow grouping items in Combobox component (mastodon#38730)
570f2ef
@mjankowski
Remove invalid options from recovery codes controller (mastodon#38733)
5722b1b
@oneiros
Improve collection item behavior in REST API (mastodon#38732)
b846f88
@mjankowski @ClearlyClaire
Update to copy and order for media display options (mastodon#38731)
475e683 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@shleeable
Fix incorrect only option in before_validation filters (mastodon#…
9afaa23 
…38704)
@mjankowski
Use model constants more consistently for view expiration collections (…
1d3ca80 
…mastodon#38589)
@mjankowski
Add AccountMigration#remaining_cooldown_days method (mastodon#38561)
ea33d7f
@diondiondion
Update design of account search dropdown in collection editor (mastod…
05a1c17 
…on#38739)
@mjankowski
Add domain_variants helper to DomainNormalizable concern (mastodo…
b15d234 
…n#38539)
@ClearlyClaire
Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-s…
e0a34e6 
…oc/merge-upstream
@diondiondion @ClearlyClaire
[Glitch] Add more actions to collections notifications & context menus
87c66c8 
Port 543db6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Update design of collection accounts editor
7c9d73d 
Port 5a38246 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix Bundle being used with incorrect prop types by using t…
fe86993 
…ype-dependent `key`

Port 0e6180a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Implement new Collection inclusion rules in Collection accou…
8257bdc 
…nts editor

Port a40b071 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Remove "View other collections from this user" from collecti…
3916132 
…on menu

Port e571994 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Allow grouping items in Combobox component
fe712fa 
Port 570f2ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Update design of account search dropdown in collection editor
582a8a0 
Port 05a1c17 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@shleeable
Fallback to default theme when admin-selected theme does not exist (m…
bdad4f7 
…astodon#38703)
@ClearlyClaire
Merge pull request #3484 from glitch-soc/glitch-soc/merge-upstream
687a24d 
Merge upstream changes up to b15d234
@renovate
Update Yarn to v4.14.1 (mastodon#38720)
048700d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sidekiq to v8.1.3 (mastodon#38723)
225fe58 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency faker to v3.8.0 (mastodon#38724)
45fbb3b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sidekiq-scheduler to v6.0.2 (mastodon#38737)
06417e2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency propshaft to v1.3.2 (mastodon#38740)
0d283cc 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#38743)
d9149bf 
Co-authored-by: GitHub Actions <noreply@github.com>
ChaosExAnima and others added 30 commits May 7, 2026 15:54
@ChaosExAnima
Fix fields not having links (mastodon#38945)
496d41c
@ClearlyClaire
Redirect with interstitial when trying to view a remote collection wh…
b2aa476 
…ile logged out (mastodon#38941)
@ClearlyClaire
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-s…
99f0a03 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Swap from React Helmet to Unhead
e4c8ac8 
Port d0c8eb2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Hide "Follows you" badge when viewing your own list of follo…
ddd1007 
…wers

Port 2fed2ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Profile: Remove old classes
9878010 
Port f24f98c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Show "Follow" button next to accounts in a collection when l…
f532c9f 
…ogged out

Port 60a437e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] React Strict Mode
9d382bc 
Port c479226 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix collection sharing/link copying using the local/relative…
64165be 
… collection URL

Port 9c8e185 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix "New collection" link appearing on other accounts' profiles
87d61a2 
Port 674e268 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Fix fields not having links
3d93d48 
Port 496d41c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3498 from glitch-soc/glitch-soc/merge-upstream
ccb7bd1 
Merge upstream changes up to b2aa476
@shleeable
Fix mastodon#38946 (mastodon#38951)
9ff094b
@diondiondion
Fix text overflow issues in list item component (mastodon#38954)
b713339
@diondiondion
Fix crash when rendering remote post with collection card (mastodon#3…
658ad9f 
…8959)
@diondiondion
Add language to collection payload (mastodon#38961)
86e4ecf
@diondiondion
Improve layout and spacing of number fields (mastodon#38963)
cf7a092
@diondiondion
New profile: Fix link colors in bio and display name overflow (mastod…
2543425 
…on#38964)
@ChaosExAnima
Remove legacy emojify function (mastodon#38965)
8d6406f
@diondiondion
Stylelint: Allow leading underscore in CSS variable names (mastodon#3…
dcc26c1 
…8966)
@ClearlyClaire
Merge commit 'dcc26c1b2484848d5b7c3c1a56cfe38b37e83d23' into glitch-s…
8785d3f 
…oc/merge-upstream
@shleeable @ClearlyClaire
[Glitch] Fix mastodon#38946
c68fa56 
Port 9ff094b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix text overflow issues in list item component
0da13f7 
Port b713339 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix crash when rendering remote post with collection card
baceb78 
Port 658ad9f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Add language to collection payload
012c6bc 
Port 86e4ecf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Improve layout and spacing of number fields
15b5812 
Port cf7a092 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] New profile: Fix link colors in bio and display name overflow
ae79b96 
Port 2543425 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Stylelint: Allow leading underscore in CSS variable names
a519e94 
Port dcc26c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ChaosExAnima @ClearlyClaire
[Glitch] Remove legacy emojify function
5650b5a 
Port 8d6406f to glitch-soc

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