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 a021dee64214fcc662c0c36ad4e44dc1deaba65f #2841

Merged
merged 8 commits into from
Sep 12, 2024
Merged

Merge upstream changes up to a021dee64214fcc662c0c36ad4e44dc1deaba65f #2841

merged 8 commits into from
Sep 12, 2024

Commits on Sep 9, 2024

  1. Change labels on thread indicators in web UI (mastodon#31806)

    @Gargron
    Gargron authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a021dee View commit details
    Browse the repository at this point in the history

  2. Add FeaturedTag coverage, use pick in model (mastodon#31828)

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

  3. Fix translatable source string using “silenced” instead of “limited” (m… 

    …astodon#31822)
    @ClearlyClaire
    ClearlyClaire authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    592a7af View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Update dependency oj to v3.16.6 (mastodon#31831) 

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

  2. Use with_options for shared Account validation option value (mastod… 

    …on#31827)
    @mjankowski
    mjankowski authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    5b99514 View commit details
    Browse the repository at this point in the history

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

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

Commits on Sep 11, 2024

  1. Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-s… 

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

  2. [Glitch] Change labels on thread indicators in web UI 

    Partial port of a021dee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @Gargron @ClearlyClaire
    Gargron authored and ClearlyClaire committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e2c101e View commit details
    Browse the repository at this point in the history