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 fe04291af46d7cb9d3439fa73739b2ffb2b53d72 #2835

Merged
merged 26 commits into from
Sep 4, 2024
Merged

Merge upstream changes up to fe04291af46d7cb9d3439fa73739b2ffb2b53d72 #2835

merged 26 commits into from
Sep 4, 2024

Commits on Sep 4, 2024

  1. Enable "zero monkey patching" mode in RSpec (mastodon#31614)

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

  2. Remove accidental matcher debug code (mastodon#31732)

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

  3. Add coverage for model normalizations (mastodon#31734)

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

  4. Fix Corepack prompt on Devcontainer (mastodon#31729)

    @vmstan
    vmstan authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a24049d View commit details
    Browse the repository at this point in the history

  5. Update dependency sass to v1.78.0 (mastodon#31739) 

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

  6. Update dependency aws-sdk-s3 to v1.160.0 (mastodon#31735) 

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

  7. Update dependency test-prof to v1.4.2 (mastodon#31733) 

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

  8. Update dependency ruby to v3.3.5 (mastodon#31719) 

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

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

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

  10. Extract method for self-referencing records in `AccountStatusCleanupP… 

    …olicy` (mastodon#31244)
    @mjankowski
    mjankowski authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    58df00f View commit details
    Browse the repository at this point in the history

  11. Update dependency shoulda-matchers to v6.4.0 (mastodon#31731) 

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

  12. Update eslint (non-major) (mastodon#31684) 

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

  13. Update dependency pino to v9.4.0 (mastodon#31720) 

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

  14. Update dependency pino-http to v10.3.0 (mastodon#31721) 

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

  15. Update dependency postcss to v8.4.45 (mastodon#31742) 

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

  16. Allow POST /oauth/revoke through CORS (mastodon#31743)

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

  17. Fix 500 error in GET /api/v2_alpha/notifications when there are no … 

    …notifications to return (mastodon#31746)
    @ClearlyClaire
    ClearlyClaire authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    1fcffa5 View commit details
    Browse the repository at this point in the history

  18. Fix all notification types being stored without filtering when polling ( 

    mastodon#31745)
    @ClearlyClaire
    ClearlyClaire authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    fab29eb View commit details
    Browse the repository at this point in the history

  19. Fix display name being displayed instead of domain in remote reports (m… 

    …astodon#31613)
    @ClearlyClaire
    ClearlyClaire authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    585e369 View commit details
    Browse the repository at this point in the history

  20. Streaming: Improve Redis connection options handling (mastodon#31623)

    @ThisIsMissEm
    ThisIsMissEm authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    9ba81ea View commit details
    Browse the repository at this point in the history

  21. Add redis sentinel support to ruby part of code (mastodon#31744)

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

  22. Use more accurate beginning/ending times in annual report source (mas… 

    …todon#31751)
    @mjankowski
    mjankowski authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    fe04291 View commit details
    Browse the repository at this point in the history

  23. Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
    @ClearlyClaire
    ClearlyClaire committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5a55180 View commit details
    Browse the repository at this point in the history

  24. [Glitch] Fix all notification types being stored without filtering wh… 

    …en polling

Port fab29eb to glitch-soc

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

  25. [Glitch] Fix display name being displayed instead of domain in remote… 

    … reports

Port 585e369 to glitch-soc

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

  26. Fix glitch-soc-only tests

    @ClearlyClaire
    ClearlyClaire committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    cb1eaa1 View commit details
    Browse the repository at this point in the history