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 44d92fa4f6aac5c45ad358287af48cd879f5665e #2898

Merged
merged 53 commits into from
Nov 16, 2024
Merged

Merge upstream changes up to 44d92fa4f6aac5c45ad358287af48cd879f5665e #2898

merged 53 commits into from
Nov 16, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Nov 15, 2024 •
edited
Loading

Ported changes

Skipped changes

  • 2de0182 (glitch flavor's code structure is different and did not have this bug)

ThisIsMissEm and others added 30 commits November 10, 2024 12:26
@ThisIsMissEm
Fix typo in account unlocked localisation (mastodon#32821)
e22ec25
@c960657
Backspace hotkey should override default behaviour (mastodon#32826)
157fba4
@mjankowski
Move account silence-related methods to concern (mastodon#28866)
d033920
@mjankowski
Move account sensitize-related methods to concern (mastodon#28865)
c78dc23
@ThisIsMissEm
Prevent Web::Push notification delivery if notification is outside of…
aeae152 
… TTL window (mastodon#32842)
@mjankowski
Use mastodon config namespace to load software update default value…
c099797 
… via `config_for` (mastodon#30534)
@renovate
Update dependency aws-sdk-s3 to v1.170.1 (mastodon#32846)
5a99ac3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss-preset-env to v10.1.0 (mastodon#32835)
67a2b03 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss to v8.4.49 (mastodon#32831)
90b5017 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @formatjs/cli to v6.3.8 (mastodon#32830)
8851222 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ThisIsMissEm
Add audit logging to Relays (mastodon#32819)
a34edc2
@renovate
Update dependency react-select to v5.8.3 (mastodon#32817)
1f85ca2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Define constants for sampling sizes in AccountReachFinder (mastodon…
ea6d3ca 
…#32805)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32811)
0d06d70 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Update changelog and docker tags to v4.3.1 (mastodon#32849)
e97f4b1
@ThisIsMissEm
Fix: prevent linking to pages which require extra permissions (mastod…
bf60909 
…on#32843)
@mjankowski
Run bin/rails db:schema:dump under Rails 7.2 (mastodon#32838)
897cb18
@mjankowski
Add age/expiry duration constants to BulkImport class (mastodon#32839)
5d9dde3
@renovate
Update dependency strong_migrations to v2.1.0 (mastodon#32810)
f8e96e7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron
Fix a few visual issues with annual reports in web UI (mastodon#32807)
32e5e1d
@ClearlyClaire
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer (mastodon#…
f5f6273 
…32850)
@mjankowski
Prepare the way for banning a bunch of usernames (mastodon#32856)
884bbf7
@mjankowski
Remove unused api/v1/polls#create route (mastodon#32860)
ace4268
@ThisIsMissEm
Add client_secret_expires_at to OAuth Applications (mastodon#30317)
2bd56f7
@mjankowski
Fix error in CLI EmailDomainBlocks when supplying --with-dns-records (
a6d829e 
mastodon#32863)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32868)
baad795 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Misc gem version bumps (mastodon#32854)
95d7120
@ClearlyClaire
Fix list creation limit check (mastodon#32869)
8f5cbf5
@jmking-iftas
Adds a range of reserved usernames to reduce potential misuse by mali…
03ecf5d 
…cious actors (mastodon#32828)
@renovate
Update dependency react-textarea-autosize to v8.5.5 (mastodon#32872)
7fc8292 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 23 commits November 14, 2024 09:15
@renovate
Update dependency browser to v6.1.0 (mastodon#32878)
980970d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32884)
aaebf14 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix Content Warning and filter states not applying to boosted posts p…
ec663ea 
…roperly (mastodon#32887)
@ClearlyClaire
Fix titles being escaped twice (mastodon#32889)
e8b6607
@mjankowski
Add DomainResource class to wrap MX lookup/normalize (mastodon#32864)
62d6550
@mjankowski
Add coverage for malformed version cleanup in `SoftwareUpdateCheckSer…
766358e 
…vice`, add helper query methods (mastodon#32876)
@ClearlyClaire
Fix filters not being correctly applied to boosted posts (mastodon#32895
2de0182 
)
@ThisIsMissEm
Improve display of statuses in admin panel (mastodon#30813)
ddfb3d1
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32900)
c546aa5 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix domain attribution field having autocorrect and autocapitalize en…
0838cf1 
…abled (mastodon#32903)
@ClearlyClaire
Fix uploading higher-than-wide GIF profile picture with libvips enabl…
f1ef7b5 
…ed (mastodon#32911)
@shleeable
Rails 7+: primary_abstract_class recommendation (mastodon#32909)
34d7c9e
@mjankowski
Move body class to shared partial for web app controller concern views (
297ce9e 
mastodon#31797)
@mjankowski
Fix logic in "last used at per application" oauth token list (mastodo…
3191090 
…n#32912)
@renovate
Update dependency uuid to v11 (mastodon#32676)
54a7c18 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Combine shared-setup examples across spec/controllers/auth/* specs (m…
7bd7705 
…astodon#32906)
@mjankowski
Remove unused failure action in api/base controller spec (mastodon#32905
9d3fcc3 
)
@renovate
Update dependency uuid to v11.0.3 (mastodon#32913)
44d92fa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-s…
4f12429 
…oc/merge-upstream
@c960657 @ClearlyClaire
[Glitch] Backspace hotkey should override default behaviour
e98891f 
Port 157fba4 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Fix a few visual issues with annual reports in web UI
e86c1c8 
Port 32e5e1d to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix Content Warning and filter states not applying to booste…
18aa0d8 
…d posts properly (refactor only)

Port ec663ea to glitch-soc

Signed-off-by: Claire <[email protected]>
@ThisIsMissEm @ClearlyClaire
[Glitch] Improve display of statuses in admin panel
0e9ab53 
Port ddfb3d1 to glitch-soc (CSS only)

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review November 15, 2024 19:56
@ClearlyClaire ClearlyClaire merged commit 3136079 into glitch-soc:main Nov 16, 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 @ThisIsMissEm @c960657 @mjankowski @Gargron @jmking-iftas @shleeable