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 e0648a916ab81925545504173bf4f43ec64d4f3c #2846

Merged
merged 19 commits into from
Sep 16, 2024
Merged

Merge upstream changes up to e0648a916ab81925545504173bf4f43ec64d4f3c #2846

merged 19 commits into from
Sep 16, 2024

Commits on Sep 14, 2024

  1. Increase preview card image size limit from 2MB to 8MB when using lib… 

    …vips (mastodon#31904)
    @ClearlyClaire
    ClearlyClaire authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    4b40d13 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Update dependency i18n to v1.14.6 (mastodon#31925) 

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

  2. Update dependency husky to v9.1.6 (mastodon#31923) 

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

  3. Update DefinitelyTyped types (non-major) (mastodon#31922) 

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

  4. Update dependency postcss to v8.4.47 (mastodon#31913) 

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

  5. Add coverage for Bookmark validation and reblog/status check callba… 

    …ck (mastodon#31907)
    @mjankowski
    mjankowski authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    822e918 View commit details
    Browse the repository at this point in the history

  6. Add validation coverage for CustomEmoji shortcode value (mastodon#3… 

    …1906)
    @mjankowski
    mjankowski authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    abd2f56 View commit details
    Browse the repository at this point in the history

  7. Enable Rails/Output in spec/ dir (mastodon#31905)

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

  8. Update dependencies omniauth-saml, ruby-xml and ruby-saml (mastodon#3… 

    …1926)
    @ClearlyClaire
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    1d58f93 View commit details
    Browse the repository at this point in the history

  9. New Crowdin Translations (automated) (mastodon#31911) 

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

  10. Remove follow creation from ListAccount fabricator (mastodon#31902)

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

  11. Add global Regexp timeout (mastodon#31928)

    @ClearlyClaire
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    d5cf27e View commit details
    Browse the repository at this point in the history

  12. Convert notification requests actions and reducers to Typescript (mas… 

    …todon#31866)
    @ClearlyClaire
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c0eda83 View commit details
    Browse the repository at this point in the history

  13. Fix horizontal scrollbar on who to follow carousel in web UI (mastodo… 

    …n#31912)
    @Gargron
    Gargron authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    efb0e2c View commit details
    Browse the repository at this point in the history

  14. Rename /api/v2_alpha/notifications* to /api/v2/notifications* (ma… 

    …stodon#31840)
    @ClearlyClaire
    ClearlyClaire authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    e0648a9 View commit details
    Browse the repository at this point in the history

  15. Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
    @ClearlyClaire
    ClearlyClaire committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    665e912 View commit details
    Browse the repository at this point in the history

  16. [Glitch] Convert notification requests actions and reducers to Typesc… 

    …ript

Port c0eda83 to glitch-soc

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

  17. [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI 

    Port efb0e2c to glitch-soc

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

  18. [Glitch] Rename /api/v2_alpha/notifications* to `/api/v2/notificati… 

    …ons*`

Port e0648a9 to glitch-soc

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