Skip to content

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

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

[pull] main from glitch-soc:main#523
pull[bot] wants to merge 2893 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
ClearlyClaire and others added 28 commits May 13, 2026 21:36
@ClearlyClaire
Merge pull request #3502 from glitch-soc/glitch-soc/merge-upstream
28b9814 
Merge upstream changes up to 8bbde18
@larouxn
Add libheif dependencies to setup-ruby action to unbreak `media_a…
630ad9f 
…ttachment_spec.rb` on latest pre-release yet rolled out runner image (mastodon#39052)
@renovate
Update dependency aws-sdk-core to v3.247.0 (mastodon#39035)
d70c807 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sidekiq to v8.1.5 (mastodon#39032)
f095346 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#39037)
3294b57 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency strong_migrations to v2.8.0 (mastodon#39040)
b946b86 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ChaosExAnima
Fixes bio spacing when there aren't paragraph tags (mastodon#39055)
cdf48e8
@shleeable
Fix accounts header banner grayscale (mastodon#39042)
bb94f91
@oneiros
Temporary tweak to account background refresh (mastodon#39062)
db30473
@mjankowski
Use ruby version 4.0.4 (mastodon#39016)
75024a1
@renovate
Update dependency aws-sdk-s3 to v1.222.0 (mastodon#39036)
8f47470 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ws to v8.20.1 (mastodon#39018)
19b19ad 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update formatjs monorepo (mastodon#39013)
a05d2d7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency axios to v1.16.1 (mastodon#39031)
19914e9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire @diondiondion
Nudge users to turn on discoverable when viewing the empty list of …
99b72f6 
…collections they are in (mastodon#39029)

Co-authored-by: diondiondion <mail@diondiondion.com>
@diondiondion
Update content & placement of "sensitive content" warning on collecti…
dcb6dbb 
…on page (mastodon#39069)
@diondiondion
Unify compact button size between variants (mastodon#39070)
28ae61f
@mjankowski
Remove unused bin/retry script (mastodon#39071)
2402730
@arte7
Add batch remove for collections in reports (mastodon#39020)
07a05e1
@diondiondion
Allow users to change how accounts are sorted when viewing a collecti…
c26003a 
…on (mastodon#39073)
@ClearlyClaire
Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-s…
42ec9a6 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Fixes bio spacing when there aren't paragraph tags
590e304 
Port cdf48e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@shleeable @ClearlyClaire
[Glitch] Fix accounts header banner grayscale
06e0734 
Port bb94f91 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire @diondiondion
[Glitch] Nudge users to turn on discoverable when viewing the empty…
108f8c9 
… list of collections they are in

Port 99b72f6 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Update content & placement of "sensitive content" warning on…
95328ba 
… collection page

Port dcb6dbb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Unify compact button size between variants
a7741db 
Port 28ae61f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@arte7 @ClearlyClaire
[Glitch] Add batch remove for collections in reports
2e09ef3 
Port 07a05e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Allow users to change how accounts are sorted when viewing a…
e210a94 
… collection

Port c26003a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
diondiondion and others added 30 commits June 2, 2026 12:04
@diondiondion
Fix formatting of user names with custom emojis in EmptyState compo…
b076ef1 
…nent (mastodon#39249)
@ClearlyClaire
Fix not importing stylesheet recursively (mastodon#39254)
d1c26c1
@ClearlyClaire
Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-s…
dd12ed2 
…oc/merge-upstream
@diondiondion @ClearlyClaire
[Glitch] Fixes author name spacing in trending links items
a864d25 
Port 0f7ec43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix formatting of user names with custom emojis in `EmptySta…
4edebef 
…te` component

Port b076ef1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mortie @ClearlyClaire
[Glitch] Make the hidden account message less misleading
4a5cfb0 
Port 78e8ee7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3519 from glitch-soc/glitch-soc/merge-upstream
73dc3ea 
Merge upstream changes up to d1c26c1
@renchap
Change Mastodon gGmbH => Mastodon GmbH (mastodon#39261)
f0359af
@ClearlyClaire
Merge commit from fork
c2daca6
@arte7
Merge commit from fork
0723601 
* add guard clause to check for node attributes

* check for encoding attribute specifically

* check for encoding attribute specifically

* change spec
@ClearlyClaire
Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-s…
659a077 
…oc/merge-upstream
@renchap @ClearlyClaire
[Glitch] Change Mastodon gGmbH => Mastodon GmbH
c16de0b 
Port f0359af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #3520 from glitch-soc/glitch-soc/merge-upstream
8e8c7bc 
Merge upstream changes up to 0723601
@ClearlyClaire
Bump version to v4.5.11 (mastodon#39264)
0529a1f
@ClearlyClaire
Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-s…
003ad01 
…oc/merge-upstream
@oneiros
Remove featuredObjectType property (mastodon#39260)
c5432e3
@ClearlyClaire
Merge pull request #3523 from glitch-soc/glitch-soc/merge-upstream
bbab7cf 
Merge upstream changes up to 0529a1f
@ChaosExAnima
Remove PWA plugin (mastodon#39250)
0172d81
@diondiondion
Fix about page error when selecting non-default Rules language (masto…
0ff2c7a 
…don#39267)
@mjankowski
Exercise more of rule_translations/_rule_translation partial (masto…
65622a5 
…don#39266)
@diondiondion
[Accessibility] Add hotkeys PageUp and PageDown for list navigati…
ce3fdf7 
…on (mastodon#39252)
@diondiondion
Limit compose field height to prevent column scrolling (mastodon#39268)
4cbea7f
@oneiros
Add missing FeaturedCollection vocabulary to contexts (mastodon#39251)
8b18195
@Gargron @ClearlyClaire @diondiondion
Bump version to v4.6.0-beta.1 (mastodon#39222)
52aa8a4 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
@ClearlyClaire
Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-s…
a1ab96b 
…oc/merge-upstream
@ChaosExAnima @ClearlyClaire
[Glitch] Remove PWA plugin
e9f6537 
Port 0172d81 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Fix about page error when selecting non-default Rules language
a880a02 
Port 0ff2c7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Add hotkeys PageUp and PageDown for list navigation
e61a974 
Port ce3fdf7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@diondiondion @ClearlyClaire
[Glitch] Limit compose field height to prevent column scrolling
7a2221a 
Port 4cbea7f to glitch-soc

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