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 1fc165de02d79294c8a218f5fa82bcd477484ca1 #2887

Merged
merged 60 commits into from
Oct 19, 2024
Merged

Merge upstream changes up to 1fc165de02d79294c8a218f5fa82bcd477484ca1 #2887

merged 60 commits into from
Oct 19, 2024

Commits on Oct 15, 2024

  1. Fix: Use consistent REDIS_USER environment variable in streaming (mas… 

    …todon#32493)
    @ThisIsMissEm
    ThisIsMissEm authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6d99f84 View commit details
    Browse the repository at this point in the history

  2. Fix back arrow pointing to the incorrect direction in RTL languages (m… 

    …astodon#32485)
    @renchap
    renchap authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    51345e5 View commit details
    Browse the repository at this point in the history

  3. Update dependency strong_migrations to v2.0.1 (mastodon#32503) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b5e8bc4 View commit details
    Browse the repository at this point in the history

  4. Update dependency pghero to v3.6.1 (mastodon#32502) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    5ac6415 View commit details
    Browse the repository at this point in the history

  5. New Crowdin Translations (automated) (mastodon#32339) 

    Co-authored-by: GitHub Actions <[email protected]>
    @github-actions @web-flow
    github-actions[bot] and web-flow authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    7d89cea View commit details
    Browse the repository at this point in the history

  6. add SWIFT object storage uri to CSP media hosts (mastodon#32439) 

    Co-authored-by: Claire <[email protected]>
    @kenkiku1021 @ClearlyClaire
    kenkiku1021 and ClearlyClaire authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f2378ac View commit details
    Browse the repository at this point in the history

  7. Fix follow recommendation carrousel scrolling on RTL layouts, for real ( 

    mastodon#32505)
    @ClearlyClaire
    ClearlyClaire authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    5e4cc1a View commit details
    Browse the repository at this point in the history

  8. Fix reblog icons on account media view (mastodon#32506)

    @tribela
    tribela authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    5afdb81 View commit details
    Browse the repository at this point in the history

  9. Update issue templates ot use the new GH Types, and add Troubleshooti… 

    …ng template (mastodon#32484)

Co-authored-by: Matt Jankowski <[email protected]>
    @renchap @mjankowski
    renchap and mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    a1eb1a9 View commit details
    Browse the repository at this point in the history

  10. Extend spec coverage for Poll model (mastodon#32500)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    d74c2c5 View commit details
    Browse the repository at this point in the history

  11. Reduce factory creation (132 -> 40) in lib/vacuum/* specs (mastodon#3… 

    …2498)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0cc21f1 View commit details
    Browse the repository at this point in the history

  12. Expand coverage for Scheduler::IpCleanupScheduler worker (mastodon#… 

    …32499)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    a11b599 View commit details
    Browse the repository at this point in the history

  13. Reduce factory creation (48 -> 8) in AP::Note serializer spec (mast… 

    …odon#32492)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b1c1096 View commit details
    Browse the repository at this point in the history

  14. Reduce factory creation (73 -> 64) in PublicFeed spec (mastodon#32491)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    d1d2278 View commit details
    Browse the repository at this point in the history

  15. Use context for repeated scenarios in AccountStatusCleanupPolicy … 

    …spec (mastodon#32489)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    92bb197 View commit details
    Browse the repository at this point in the history

  16. Reduce factories (36 > 12) in AccountReachFinder spec (mastodon#32482)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6a39212 View commit details
    Browse the repository at this point in the history

  17. Translate to regional language variant (e.g. pt-BR) (mastodon#32428)

    @c960657
    c960657 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    227d468 View commit details
    Browse the repository at this point in the history

  18. Expand coverage for Block model (mastodon#32480)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    bfb41e6 View commit details
    Browse the repository at this point in the history

  19. Update formatjs monorepo (mastodon#32304) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c19397b View commit details
    Browse the repository at this point in the history

  20. Update dependency react-textarea-autosize to v8.5.4 (mastodon#32401) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c772b41 View commit details
    Browse the repository at this point in the history

  21. Expand coverage for User#token_for_app (mastodon#32434)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    27f05e9 View commit details
    Browse the repository at this point in the history

  22. Reduce factory creation (14 -> 8) in ActivityPub::Activity::Block s… 

    …pec (mastodon#32488)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e9b2785 View commit details
    Browse the repository at this point in the history

  23. Use array compact style for classes in nothing_here helper (mastodo… 

    …n#32403)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0e58dc9 View commit details
    Browse the repository at this point in the history

  24. Update babel monorepo to v7.25.8 (mastodon#32391) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    92c8860 View commit details
    Browse the repository at this point in the history

  25. Reduce factory creation (17 -> 0) in PlainTextFormatter spec (masto… 

    …don#32487)
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b742ce9 View commit details
    Browse the repository at this point in the history

  26. Fix missing content warning text in rss formatter (mastodon#32406)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b785979 View commit details
    Browse the repository at this point in the history

  27. Add mention of encryption secrets to production sample (mastodon#32512)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    52bc331 View commit details
    Browse the repository at this point in the history

  28. Convert status embed controller to request spec (mastodon#32448)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    28131b4 View commit details
    Browse the repository at this point in the history

  29. Improve app/policies coverage (mastodon#32426)

    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9e8f099 View commit details
    Browse the repository at this point in the history

  30. Convert admin/invites controller specs to system specs (mastodon#32450 

    )
    @mjankowski
    mjankowski authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c40cd79 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Add back a 6 hours mute duration option (mastodon#32522)

    @renchap
    renchap authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7a7a7cc View commit details
    Browse the repository at this point in the history

  2. Fix only the first paragraph being displayed in some notifications (m… 

    …astodon#32348)
    @ClearlyClaire
    ClearlyClaire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    25f8003 View commit details
    Browse the repository at this point in the history

  3. Run migration tests against postgres 16 and 17 as well (mastodon#32416)

    @jippi
    jippi authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5900c8c View commit details
    Browse the repository at this point in the history

  4. Explicitly install ImageMagick in CI (except for libvips tests) (mast… 

    …odon#32534)
    @ClearlyClaire
    ClearlyClaire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f8ba212 View commit details
    Browse the repository at this point in the history

  5. Add inline_jobs to admin/reset spec (mastodon#32517)

    @mjankowski
    mjankowski authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bfe3d49 View commit details
    Browse the repository at this point in the history

  6. New Crowdin Translations (automated) (mastodon#32533) 

    Co-authored-by: GitHub Actions <[email protected]>
    @github-actions @web-flow
    github-actions[bot] and web-flow authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    acc1973 View commit details
    Browse the repository at this point in the history

  7. Add ability to group follow notifications in WebUI (mastodon#32520)

    @renchap
    renchap authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6c87c76 View commit details
    Browse the repository at this point in the history

  8. Change Active Record Encryption variable check to check for emptiness (… 

    …mastodon#32537)
    @ClearlyClaire
    ClearlyClaire authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6ff1954 View commit details
    Browse the repository at this point in the history

  9. Fix: Reword 'pick one' to 'single choice' for polls (mastodon#32397)

    @ThisIsMissEm
    ThisIsMissEm authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bc2e642 View commit details
    Browse the repository at this point in the history

  10. Update rails to version 7.1.4.1 (mastodon#32542)

    @mjankowski
    mjankowski authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a0c7b31 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Fix trailing slash newline in changelog (mastodon#32545)

    @mjankowski
    mjankowski authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5103abc View commit details
    Browse the repository at this point in the history

  2. Fix missing or incorrect cache-control headers for Streaming server (m… 

    …astodon#32551)
    @ThisIsMissEm
    ThisIsMissEm authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    b23ff05 View commit details
    Browse the repository at this point in the history

  3. New Crowdin Translations (automated) (mastodon#32553) 

    Co-authored-by: GitHub Actions <[email protected]>
    @github-actions @web-flow
    github-actions[bot] and web-flow authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    009f2eb View commit details
    Browse the repository at this point in the history

  4. Add more explicit explanations about author attribution and `fedivers… 

    …e:creator` (mastodon#32383)
    @ClearlyClaire
    ClearlyClaire authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8b56509 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Fix broken i18n in text welcome mailer tags area (mastodon#32571)

    @mjankowski
    mjankowski authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    bd6c96f View commit details
    Browse the repository at this point in the history

  2. Fix column-settings spacing in local timeline in advanced view (masto… 

    …don#32567)
    @lindwurm
    lindwurm authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    0f37b7d View commit details
    Browse the repository at this point in the history

  3. New Crowdin Translations (automated) (mastodon#32573) 

    Co-authored-by: GitHub Actions <[email protected]>
    @github-actions @web-flow
    github-actions[bot] and web-flow authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    8eae0d0 View commit details
    Browse the repository at this point in the history

  4. Fix follow recommendation moderation page default language when using… 

    … regional variant (mastodon#32580)
    @ClearlyClaire
    ClearlyClaire authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    2391937 View commit details
    Browse the repository at this point in the history

  5. Remove ability to get embed code for remote posts (mastodon#32578)

    @ClearlyClaire
    ClearlyClaire authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    1fc165d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-s… 

    …oc/merge-upstream

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.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
    @ClearlyClaire
    ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    6281c4d View commit details
    Browse the repository at this point in the history

  2. [Glitch] Fix back arrow pointing to the incorrect direction in RTL la… 

    …nguages

Port 51345e5 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    d63594d View commit details
    Browse the repository at this point in the history

  3. [Glitch] Fix follow recommendation carrousel scrolling on RTL layouts… 

    …, for real

Port 5e4cc1a to glitch-soc

Signed-off-by: Claire <[email protected]>
    @ClearlyClaire
    ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    886a422 View commit details
    Browse the repository at this point in the history

  4. [Glitch] Fix reblog icons on account media view 

    Port 5afdb81 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @tribela @ClearlyClaire
    tribela authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    e35ee2c View commit details
    Browse the repository at this point in the history

  5. [Glitch] Add back a 6 hours mute duration option 

    Port 7a7a7cc to glitch-soc

Signed-off-by: Claire <[email protected]>
    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    2f854c5 View commit details
    Browse the repository at this point in the history

  6. [Glitch] Fix only the first paragraph being displayed in some notific… 

    …ations

Port 25f8003 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @ClearlyClaire
    ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    42336d8 View commit details
    Browse the repository at this point in the history

  7. [Glitch] Add ability to group follow notifications in WebUI 

    Port 6c87c76 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @renchap @ClearlyClaire
    renchap authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    829ff86 View commit details
    Browse the repository at this point in the history

  8. [Glitch] Add more explicit explanations about author attribution and … 

    …`fediverse:creator`

Port 8b56509 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @ClearlyClaire
    ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    b428921 View commit details
    Browse the repository at this point in the history

  9. [Glitch] Fix column-settings spacing in local timeline in advanced view 

    Port 0f37b7d to glitch-soc

Signed-off-by: Claire <[email protected]>
    @lindwurm @ClearlyClaire
    lindwurm authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    f0207d1 View commit details
    Browse the repository at this point in the history

  10. [Glitch] Remove ability to get embed code for remote posts 

    Port 1fc165d to glitch-soc

Signed-off-by: Claire <[email protected]>
    @ClearlyClaire
    ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    6bd185b View commit details
    Browse the repository at this point in the history

  11. [Glitch] Fix: Reword 'pick one' to 'single choice' for polls 

    Port bc2e642 to glitch-soc

Signed-off-by: Claire <[email protected]>
    @ThisIsMissEm @ClearlyClaire
    ThisIsMissEm authored and ClearlyClaire committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    ba365ac View commit details
    Browse the repository at this point in the history