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 70988519df66f0b8edeb6ca95140f1d3e436fea8 #2856

Merged
merged 17 commits into from
Sep 24, 2024
Merged

Merge upstream changes up to 70988519df66f0b8edeb6ca95140f1d3e436fea8 #2856

merged 17 commits into from
Sep 24, 2024

Commits on Sep 24, 2024

  1. Change hide media button to be in top right corner in web UI (mastodo… 

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

  2. Update dependency webrick (mastodon#32054)

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

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

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

  4. Update dependency aws-sdk-s3 to v1.165.0 (mastodon#32050) 

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

  5. Convert notification mailer spec shared examples to matchers (mastodo… 

    …n#32047)
    @mjankowski
    mjankowski authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    780e2e9 View commit details
    Browse the repository at this point in the history

  6. Set important mailer headers with after_action callback (mastodon#3… 

    …2057)
    @mjankowski
    mjankowski authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    19dedd7 View commit details
    Browse the repository at this point in the history

  7. Increase regexp timeout and allow override (mastodon#32056)

    @oneiros
    oneiros authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    cfb8fc6 View commit details
    Browse the repository at this point in the history

  8. Fix multiple bugs in notification requests and notification policies (m… 

    …astodon#32062)
    @ClearlyClaire
    ClearlyClaire authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    0a6b75b View commit details
    Browse the repository at this point in the history

  9. Fix error when accepting appeal for sensitive posts deleted in the me… 

    …antime (mastodon#32037)

Co-authored-by: David Roetzel <[email protected]>
    @ClearlyClaire @oneiros
    ClearlyClaire and oneiros authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c36a76b View commit details
    Browse the repository at this point in the history

  10. Fix the summary of converted object types to be treated as HTML (mast… 

    …odon#28629)
    @Menrath
    Menrath authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    556837f View commit details
    Browse the repository at this point in the history

  11. Fix wrapping in dashboard quick access buttons (mastodon#32043)

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

  12. Fix too many requests caused by relationship look-ups in web UI (mast… 

    …odon#32042)

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

  13. Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-s… 

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

  14. [Glitch] Change hide media button to be in top right corner in web UI 

    Port d54ce67 to glitch-soc

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

  15. [Glitch] Fix multiple bugs in notification requests and notification … 

    …policies

Port 0a6b75b to glitch-soc

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

  16. [Glitch] Fix wrapping in dashboard quick access buttons 

    Port f1b6a61 to glitch-soc

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

  17. [Glitch] Fix too many requests caused by relationship look-ups in web UI 

    Port 7098851 to glitch-soc

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