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 28966fa0a6d7b98ee94696acdc79e45449ce8349 #2858

Merged
merged 17 commits into from
Sep 25, 2024
Merged

Merge upstream changes up to 28966fa0a6d7b98ee94696acdc79e45449ce8349 #2858

merged 17 commits into from
Sep 25, 2024

Commits on Sep 25, 2024

  1. Update dependency aws-sdk-s3 to v1.166.0 (mastodon#32079) 

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

  2. New Crowdin Translations (automated) (mastodon#32083) 

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

  3. Use not-allowed for cursor on disabled buttons (mastodon#32076)

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

  4. Remove single-use shared examples in controller specs (mastodon#32044)

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

  5. Reduce factory creation (36 -> 12) in spec/controllers/oauth/* area (… 

    …mastodon#32045)
    @mjankowski
    mjankowski authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c3b6a7a View commit details
    Browse the repository at this point in the history

  6. Consolidate shared a scope example parts into one attributes check (m… 

    …astodon#32046)
    @mjankowski
    mjankowski authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c2ef83e View commit details
    Browse the repository at this point in the history

  7. Add coverage and use mailer callback to check functional user in noti… 

    …fication mailer (mastodon#32055)
    @mjankowski
    mjankowski authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    83574f6 View commit details
    Browse the repository at this point in the history

  8. Fix search params being dropped when redirected to non-deck path (mas… 

    …todon#31984)
    @renchap
    renchap authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    3dc4ddc View commit details
    Browse the repository at this point in the history

  9. Add notification grouping for follow notifications (mastodon#32085)

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

  10. Prefer structure checks over multi-line size/parts checks in `parsed_… 

    …body` (mastodon#32063)
    @mjankowski
    mjankowski authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    51777fe View commit details
    Browse the repository at this point in the history

  11. Keep the status action buttons at their position regardless of the co… 

    …unter size (mastodon#32084)

Co-authored-by: Claire <[email protected]>
    @renchap @ClearlyClaire
    renchap and ClearlyClaire authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    739ad0e View commit details
    Browse the repository at this point in the history

  12. Remove deprecated v2_alpha endpoint for grouped notifications (mast… 

    …odon#32089)
    @renchap
    renchap authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    28966fa View commit details
    Browse the repository at this point in the history

  13. Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-s… 

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

  14. [Glitch] Use not-allowed for cursor on disabled buttons 

    Port 69aa569 to glitch-soc

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

  15. [Glitch] Fix search params being dropped when redirected to non-deck … 

    …path

Port 3dc4ddc to glitch-soc

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

  16. [Glitch] Add notification grouping for follow notifications 

    Port d6f5ee7 to glitch-soc

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

  17. [Glitch] Keep the status action buttons at their position regardless … 

    …of the counter size

Port 739ad0e to glitch-soc

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