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 d8c428472356abd70aaf1f514b99114464ee7f61 #2704

Merged
merged 28 commits into from
May 7, 2024
Merged

Merge upstream changes up to d8c428472356abd70aaf1f514b99114464ee7f61 #2704

merged 28 commits into from
May 7, 2024

Commits on May 5, 2024

  1. Switched HTMLEntities to the expanded flavor which supports a larger … ( 

    mastodon#30173)
    @timothyjrogers
    timothyjrogers authored May 5, 2024
    Configuration menu
    Copy the full SHA
    2f73e48 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Update dependency irb to v1.13.1 (mastodon#30177) 

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

  2. Update formatjs monorepo (mastodon#30175) 

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

  3. Update dependency postcss-preset-env to v9.5.11 (mastodon#30171) 

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

  4. New Crowdin Translations (automated) (mastodon#30169) 

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

  5. Update devDependencies (non-major) (mastodon#30185) 

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

  6. Update eslint (non-major) (mastodon#30186) 

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

  7. Update DefinitelyTyped types (non-major) (mastodon#30184) 

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

  8. Fix post deletion not being deferred when those are part of an accoun… 

    …t warning (mastodon#30163)
    @ClearlyClaire
    ClearlyClaire authored May 6, 2024
    Configuration menu
    Copy the full SHA
    e5062b7 View commit details
    Browse the repository at this point in the history

  9. Use chewy which relaxes ES version reqs (mastodon#30157)

    @mjankowski
    mjankowski authored May 6, 2024
    Configuration menu
    Copy the full SHA
    dbaa4ed View commit details
    Browse the repository at this point in the history

  10. Fix race condition in POST /api/v1/push/subscription (mastodon#30166)

    @ClearlyClaire
    ClearlyClaire authored May 6, 2024
    Configuration menu
    Copy the full SHA
    8e4fea7 View commit details
    Browse the repository at this point in the history

  11. Fix hashtag matching pattern matching some link anchors (mastodon#30190)

    @ClearlyClaire
    ClearlyClaire authored May 6, 2024
    Configuration menu
    Copy the full SHA
    30ef9fc View commit details
    Browse the repository at this point in the history

  12. Implement RFC 8414 for OAuth 2.0 server metadata (mastodon#29191)

    @ThisIsMissEm
    ThisIsMissEm authored May 6, 2024
    Configuration menu
    Copy the full SHA
    116f01e View commit details
    Browse the repository at this point in the history

  13. Redirect back after site upload deletion (mastodon#30141)

    @FawazFarid
    FawazFarid authored May 6, 2024
    Configuration menu
    Copy the full SHA
    05126d1 View commit details
    Browse the repository at this point in the history

  14. Migrate paperclip _file_size columns to bigint (mastodon#29263) 

    Co-authored-by: Claire <claire.github-309c@sitedethib.com>
    @mjankowski @ClearlyClaire
    mjankowski and ClearlyClaire authored May 6, 2024
    Configuration menu
    Copy the full SHA
    b152f93 View commit details
    Browse the repository at this point in the history

  15. Allow admins to configure instance favicon and logo (mastodon#30040)

    @FawazFarid
    FawazFarid authored May 6, 2024
    Configuration menu
    Copy the full SHA
    bc24c47 View commit details
    Browse the repository at this point in the history

  16. Add API to get multiple accounts and statuses (mastodon#27871) 

    Co-authored-by: noellabo <noel.yoshiba@gmail.com>
    @ClearlyClaire @noellabo
    ClearlyClaire and noellabo authored May 6, 2024
    Configuration menu
    Copy the full SHA
    2fe1b8d View commit details
    Browse the repository at this point in the history

  17. Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
    @ClearlyClaire
    ClearlyClaire committed May 6, 2024
    Configuration menu
    Copy the full SHA
    016d194 View commit details
    Browse the repository at this point in the history

  18. Update dependency pino-http to v10 (mastodon#30191) 

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

Commits on May 7, 2024

  1. Fix db:encryption:init requiring ActiveRecord encryption variables … 

    …to be set (mastodon#30202)
    @ClearlyClaire
    ClearlyClaire authored May 7, 2024
    Configuration menu
    Copy the full SHA
    996292c View commit details
    Browse the repository at this point in the history

  2. Revert "Migrate paperclip _file_size columns to bigint (mastodon#29263 

    )" (mastodon#30203)
    @ClearlyClaire
    ClearlyClaire authored May 7, 2024
    Configuration menu
    Copy the full SHA
    96fb6e4 View commit details
    Browse the repository at this point in the history

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

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

  4. Update dependency dotenv to v3.1.2 (mastodon#30197) 

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

  5. Update dependency aws-sdk-s3 to v1.149.1 (mastodon#30196) 

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

  6. Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-s… 

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

  7. Update dependency sass to v1.77.0 (mastodon#30200) 

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

  8. Ensure custom favicon is converted to PNG and ICO (mastodon#30208)

    @ClearlyClaire
    ClearlyClaire authored May 7, 2024
    Configuration menu
    Copy the full SHA
    d8c4284 View commit details
    Browse the repository at this point in the history

  9. Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-s… 

    …oc/merge-upstream
    @ClearlyClaire
    ClearlyClaire committed May 7, 2024
    Configuration menu
    Copy the full SHA
    21c904b View commit details
    Browse the repository at this point in the history