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 82344342c1c5adb3f6a4b376559db737a9e982b7 #2782

Merged
merged 12 commits into from
Jul 18, 2024
Merged

Merge upstream changes up to 82344342c1c5adb3f6a4b376559db737a9e982b7 #2782

merged 12 commits into from
Jul 18, 2024

Commits on Jul 18, 2024

  1. Reduce extra factories in FanOutOnWriteService spec (mastodon#31053)

    @mjankowski
    mjankowski authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c5f8256 View commit details
    Browse the repository at this point in the history

  2. Use change-requiring records in admin/reports controller spec (mastod… 

    …on#31052)
    @mjankowski
    mjankowski authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    2616fde View commit details
    Browse the repository at this point in the history

  3. chore(deps): update dependency ruby-vips to v2.2.2 (mastodon#31050) 

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

  4. Reduce factory creation in AP::ProcessStatusUpdateService spec (mas… 

    …todon#31051)
    @mjankowski
    mjankowski authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    47ea83d View commit details
    Browse the repository at this point in the history

  5. New Crowdin Translations (automated) (mastodon#31055) 

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

  6. Grouped Notifications UI (mastodon#30440) 

    Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
    @renchap @Gargron @ClearlyClaire
    3 people authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f587ff6 View commit details
    Browse the repository at this point in the history

  7. Fix grouping across hourly buckets happening in a 12 seconds window i… 

    …nstead of 12 hours window (mastodon#31062)
    @ClearlyClaire
    ClearlyClaire authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    6e47637 View commit details
    Browse the repository at this point in the history

  8. fix(deps): update dependency use-debounce to v10.0.1 (mastodon#31060) 

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

  9. Reduce factory creation in MediaAttachment model spec (mastodon#31058)

    @mjankowski
    mjankowski authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    848b59c View commit details
    Browse the repository at this point in the history

  10. Add link to org-level contribution guidelines to contributing doc (ma… 

    …stodon#31043)
    @mjankowski
    mjankowski authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    8234434 View commit details
    Browse the repository at this point in the history

  11. Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-s… 

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

  12. [Glitch] Grouped Notifications UI 

    Port f587ff6 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @renchap @Gargron @ClearlyClaire
    3 people committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7224e24 View commit details
    Browse the repository at this point in the history