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 5f4d231e980665c0946297909df508269fb25dc6 #2748

Merged
merged 9 commits into from
Jun 19, 2024
Merged

Merge upstream changes up to 5f4d231e980665c0946297909df508269fb25dc6 #2748

merged 9 commits into from
Jun 19, 2024

Commits on Jun 18, 2024

  1. Unpluralize mistakenly changed privacy template (mastodon#30759)

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

Commits on Jun 19, 2024

  1. New Crowdin Translations (automated) (mastodon#30762) 

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

  2. Consolidate time periods methods into base measure (mastodon#30757)

    @mjankowski
    mjankowski authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    a8b3d2e View commit details
    Browse the repository at this point in the history

  3. chore(deps): update opentelemetry-ruby (non-major) (mastodon#30755) 

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

  4. Enable renovate lockFileMaintenance setting (mastodon#30732)

    @mjankowski
    mjankowski authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    556d409 View commit details
    Browse the repository at this point in the history

  5. Stop calling Webpacker in full-stack tests (mastodon#30763)

    @ClearlyClaire
    ClearlyClaire authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    8098d27 View commit details
    Browse the repository at this point in the history

  6. fix(deps): update dependency cssnano to v7.0.3 (mastodon#30764) 

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

  7. Use rubocop DisplayCopNames and UseCache defaults (true) (mastodo… 

    …n#30750)
    @mjankowski
    mjankowski authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    5f4d231 View commit details
    Browse the repository at this point in the history

  8. Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    52e34a6 View commit details
    Browse the repository at this point in the history