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 (stable-4.3) #2885

Merged
merged 36 commits into from
Oct 16, 2024
Merged

Merge upstream changes (stable-4.3) #2885

merged 36 commits into from
Oct 16, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Oct 15, 2024 •
edited
Loading

Merge changes up to 49b3d56

Ported changes

Merge changes up to 3645284

Conflicts

  • .env.production.sample:
    Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall.
    Added upstream's changes.

Ported changes

ClearlyClaire and others added 30 commits October 15, 2024 11:57
@ClearlyClaire
Fix follow recommendation suppressions not applying immediately (mast…
192e9d1 
…odon#32392)
@mjankowski @ClearlyClaire
Convert admin/tags controller specs to system specs (mastodon#32447)
5ee72f0
@ClearlyClaire
Add further warnings about encryption secrets (mastodon#32476)
ee61f77
@ClearlyClaire
Fix follow recommendation carrousel scrolling on RTL layouts (mastodo…
a2e24ee 
…n#32462)
@ThisIsMissEm @ClearlyClaire
Fix: Use consistent REDIS_USER environment variable in streaming (mas…
066efc2 
…todon#32493)
@renchap @ClearlyClaire
Fix back arrow pointing to the incorrect direction in RTL languages (m…
ca68a3c 
…astodon#32485)
@kenkiku1021 @ClearlyClaire
add SWIFT object storage uri to CSP media hosts (mastodon#32439)
304e440 
Co-authored-by: Claire <[email protected]>
@ClearlyClaire
Fix follow recommendation carrousel scrolling on RTL layouts, for real (
70472de 
mastodon#32505)
@tribela @ClearlyClaire
Fix reblog icons on account media view (mastodon#32506)
49b3d56
@ClearlyClaire
Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-s…
b091e53 
…oc/backports-4.3
@ClearlyClaire
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts
836cbca 
Port a2e24ee to glitch-soc

Signed-off-by: Claire <[email protected]>
@renchap @ClearlyClaire
[Glitch] Fix back arrow pointing to the incorrect direction in RTL la…
8b6247c 
…nguages

Port ca68a3c

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts…
9b6f92e 
…, for real

Port 70472de to glitch-soc

Signed-off-by: Claire <[email protected]>
@tribela @ClearlyClaire
[Glitch] Fix reblog icons on account media view
12297fa 
Port 49b3d56 to glitch-soc

Signed-off-by: Claire <[email protected]>
@mjankowski @ClearlyClaire
Extend spec coverage for Poll model (mastodon#32500)
0c59ef4
@mjankowski @ClearlyClaire
Reduce factory creation (132 -> 40) in lib/vacuum/* specs (mastodon#3…
2d00810 
…2498)
@mjankowski @ClearlyClaire
Expand coverage for Scheduler::IpCleanupScheduler worker (mastodon#…
c292ed0 
…32499)
@mjankowski @ClearlyClaire
Reduce factory creation (48 -> 8) in AP::Note serializer spec (mast…
a728196 
…odon#32492)
@mjankowski @ClearlyClaire
Reduce factory creation (73 -> 64) in PublicFeed spec (mastodon#32491)
fbe55a4
@mjankowski @ClearlyClaire
Use context for repeated scenarios in AccountStatusCleanupPolicy …
ff1247a 
…spec (mastodon#32489)
@mjankowski @ClearlyClaire
Reduce factories (36 > 12) in AccountReachFinder spec (mastodon#32482)
dc2f9ee
@c960657 @ClearlyClaire
Translate to regional language variant (e.g. pt-BR) (mastodon#32428)
0ff427f
@mjankowski @ClearlyClaire
Expand coverage for Block model (mastodon#32480)
63df649
@mjankowski @ClearlyClaire
Expand coverage for User#token_for_app (mastodon#32434)
ae676ed
@mjankowski @ClearlyClaire
Reduce factory creation (14 -> 8) in ActivityPub::Activity::Block s…
527d125 
…pec (mastodon#32488)
@mjankowski @ClearlyClaire
Add mention of encryption secrets to production sample (mastodon#32512)
ad4be12
@mjankowski @ClearlyClaire
Convert status embed controller to request spec (mastodon#32448)
6d72c13
@mjankowski @ClearlyClaire
Improve app/policies coverage (mastodon#32426)
9258ee8
@mjankowski @ClearlyClaire
Convert admin/invites controller specs to system specs (mastodon#32450
41e342a 
)
@renchap @ClearlyClaire
Add back a 6 hours mute duration option (mastodon#32522)
b01bd74
ClearlyClaire and others added 6 commits October 16, 2024 12:40
@ClearlyClaire
Fix only the first paragraph being displayed in some notifications (m…
a20f38c 
…astodon#32348)
@jippi @ClearlyClaire
Run migration tests against postgres 16 and 17 as well (mastodon#32416)
5c4bcd2
@ClearlyClaire
Explicitly install ImageMagick in CI (except for libvips tests) (mast…
3645284 
…odon#32534)
@ClearlyClaire
Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-s…
198283a 
…oc/backports-4.3

Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while
  glitch-soc has a different version of the file overall.
  Added upstream's changes.
@renchap @ClearlyClaire
[Glitch] Add back a 6 hours mute duration option
177e8fe 
Port d73b5e2 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix only the first paragraph being displayed in some notific…
8d37565 
…ations

Port 82dd6cd to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review October 16, 2024 12:03
@ClearlyClaire ClearlyClaire merged commit 3a5e83b into glitch-soc:stable-4.3 Oct 16, 2024
36 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.
8 participants
@ClearlyClaire @mjankowski @ThisIsMissEm @renchap @kenkiku1021 @tribela @c960657 @jippi