Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes up to d0753ec276502ea28a1e853cbc6487020a0602e3 #2903

Merged
merged 20 commits into from
Nov 25, 2024
Merged

Merge upstream changes up to d0753ec276502ea28a1e853cbc6487020a0602e3 #2903

merged 20 commits into from
Nov 25, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Nov 24, 2024 •
edited
Loading

Ported changes

Additional changes

  • 2259949: removed the pinned accounts editor, as it has been broken for a long time, and was depending on components that have been completely rewritten in 6260350

Postponed changes

Gargron and others added 20 commits November 20, 2024 15:56
@Gargron
Add ability to middle-mouse click posts in web UI (mastodon#32988)
683db3a
@PauloVilarinho
block scheduled status from frozen users (mastodon#30729)
2526b32
@Gargron
Fix wrong video dimensions for some rotated videos (mastodon#33008)
420ed15
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33010)
e4d5cc0 
Co-authored-by: GitHub Actions <noreply@github.com>
@ThisIsMissEm @renovate
Update dependency doorkeeper to v5.8.0 (mastodon#33000)
4517e18 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Add stop-gap antispam code (mastodon#32981)
dbddd40
@c960657
rel="me" check should be case-insenstive (mastodon#32238)
7385016
@Gargron
Change design of lists in web UI (mastodon#32881)
6260350
@ClearlyClaire
Fix duplicate notifications in notification groups when using slow mo…
4bfb888 
…de (mastodon#33014)
@Joshix-1
improve nginx.conf by setting gzip_static to on (mastodon#30698)
68c7782
@c960657
LinkDetailsExtractor adjustments (mastodon#31357)
0518613
@Gargron
Fix pushing hashtag-followed posts to feeds of inactive users (mastod…
d75088d 
…on#33018)
@mjankowski
Rely on Rails to enable YJIT when available (mastodon#33017)
be2d461
@renovate
Update Yarn to v4.5.2 (mastodon#33021)
2e5abe4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33020)
4719008 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
Update dependency aws-sdk-s3 to v1.173.0 (mastodon#33019)
d0753ec 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-s…
f740611 
…oc/merge-upstream
@ClearlyClaire
[Glitch] Fix duplicate notifications in notification groups when usin…
ba151ef 
…g slow mode

Port 4bfb888 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Remove pinned accounts editor
2259949 
It was utterly broken and the underlying modals are getting redesigned
@ClearlyClaire
[Glitch] Change design of lists in web UI
217e0f8 
Port 6260350 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 3ddcf1a to 217e0f8 Compare November 24, 2024 18:59
@ClearlyClaire ClearlyClaire marked this pull request as ready for review November 24, 2024 19:26
@ClearlyClaire ClearlyClaire merged commit 3ca5d84 into glitch-soc:main Nov 25, 2024
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ClearlyClaire @Gargron @PauloVilarinho @ThisIsMissEm @c960657 @Joshix-1 @mjankowski