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 5ba3405be4c1f708f198580b481f822698dab392 #2845

Merged
merged 8 commits into from
Sep 13, 2024
Merged

Merge upstream changes up to 5ba3405be4c1f708f198580b481f822698dab392 #2845

merged 8 commits into from
Sep 13, 2024

Commits on Sep 12, 2024

  1. Add "search" group for chewy classes in simplecov config (mastodon#31890 

    )
    @mjankowski
    mjankowski committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2020775 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. New Crowdin Translations (automated) (mastodon#31898) 

    Co-authored-by: GitHub Actions <noreply@github.com>
    @github-actions @web-flow
    github-actions[bot] and web-flow committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    353ade7 View commit details
    Browse the repository at this point in the history

  2. Remove unused argument from AccountMigration.within_cooldown (masto… 

    …don#31892)
    @mjankowski
    mjankowski committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    49cbee3 View commit details
    Browse the repository at this point in the history

  3. Add coverage for ListAccount follow/follow_request set up (mastodon… 

    …#31896)
    @mjankowski
    mjankowski committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    a2c4f5f View commit details
    Browse the repository at this point in the history

  4. Fix inability to locally suspend remotely-suspended accounts in moder… 

    …ation interface (mastodon#31899)
    @ClearlyClaire
    ClearlyClaire committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ba81e4e View commit details
    Browse the repository at this point in the history

  5. Strip protocol from attribution domains (mastodon#31900)

    @oneiros
    oneiros committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    c1b2c4f View commit details
    Browse the repository at this point in the history

  6. Update dependency opentelemetry-instrumentation-pg to '~> 0.29.0' (ma… 

    …stodon#31897)

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

  7. Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    117ac13 View commit details
    Browse the repository at this point in the history