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 611533cd12059d365ca0267342b750e615637bd4 #2833

Merged
merged 17 commits into from
Sep 3, 2024
Merged

Merge upstream changes up to 611533cd12059d365ca0267342b750e615637bd4 #2833

merged 17 commits into from
Sep 3, 2024

Commits on Sep 2, 2024

  1. Fix not being able to load more notifications after trimming (mastodo… 

    …n#31652)
    @ClearlyClaire
    ClearlyClaire authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    c1795ee View commit details
    Browse the repository at this point in the history

  2. media_ids is an array of strings (mastodon#31709)

    @c960657
    c960657 authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a5bbe83 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Update dependency rspec-rails to v7 (mastodon#31710) 

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

  2. Update dependency inline_svg to v1.10.0 (mastodon#31717) 

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

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

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

  4. Use body_as_json directly instead of via local var assignment (mast… 

    …odon#31696)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    24a0b20 View commit details
    Browse the repository at this point in the history

  5. Remove unused Mention#active? method (mastodon#31697)

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

  6. Remove unused User#inactive_message method (mastodon#31698)

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

  7. Remove unused helper method in spec (mastodon#31699)

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

  8. Add coverage for JsonLdHelper#uri_from_bearcap method (mastodon#31700)

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

  9. Update libretranslate/libretranslate Docker tag to v1.6.0 (mastodon#3… 

    …1687)

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

  10. Remove unused merge_context helper (mastodon#31703)

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

  11. Add first pass coverage for AnnualReport class (mastodon#31704)

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

  12. Remove config/secrets.yml file (mastodon#31562)

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

  13. Update dependency json-schema to v5 (mastodon#31499) 

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

  14. Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-s… 

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

  15. [Glitch] Fix not being able to load more notifications after trimming 

    Port c1795ee to glitch-soc

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