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

Upstream 20240424 #726

Merged
merged 23 commits into from
Apr 24, 2024
Merged

Upstream 20240424 #726

merged 23 commits into from
Apr 24, 2024

Conversation

kmycode
Copy link
Owner

@kmycode kmycode commented Apr 23, 2024

No description provided.

mjankowski and others added 23 commits April 22, 2024 08:04
@mjankowski @ClearlyClaire
Fix Rubocop Rails/UniqueValidationWithoutIndex cop (mastodon#27461)
2ec9bff 
Co-authored-by: Claire <[email protected]>
@renovate
Update eslint (non-major) to v7.7.0 (mastodon#30026)
223936c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update peter-evans/create-pull-request action to v6.0.4 (mastodon#30025)
88f9468 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @types/react to v18.2.79 (mastodon#30024)
3e21af3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss-preset-env to v9.5.8 (mastodon#30018)
24e67c4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix intermittent order based failure in UpdateStatusService spec (m…
a15139b 
…astodon#30008)
@mjankowski
Rely on dotenv autoload instead of explicit call (mastodon#30007)
18737aa
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30014)
3655fb6 
Co-authored-by: GitHub Actions <[email protected]>
@timothyjrogers
Fixed rendering error on /start when not logged in (mastodon#30023)
75163d9
@timothyjrogers
Fixed crash when supplying FFMPEG_BINARY environment variable (mastod…
1ca6ff8 
…on#30022)
@mjankowski
Update Gemfile.lock ruby and bundler versions (mastodon#30011)
56b095e
@mjankowski
Limit http gem version to 5.1.x series (mastodon#30010)
ffbbf74
@mjankowski
Use shared form partial for admin/domain_blocks views (mastodon#2…
33e8297 
…9609)
@ClearlyClaire
Revert "Rely on dotenv autoload instead of explicit call (mastodon#30007
2ef098d 
)" (mastodon#30028)
@renovate @ClearlyClaire
Update dependency http to '~> 5.2.0' (mastodon#30027)
483fabf 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <[email protected]>
@renovate
Update dependency rubocop to v1.63.3 (mastodon#30031)
1471c0d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss-preset-env to v9.5.9 (mastodon#30029)
91c7406 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30034)
d754b15 
Co-authored-by: GitHub Actions <[email protected]>
@ThisIsMissEm
Add read:me OAuth 2.0 scope, allowing more limited access to user data (
049b159 
mastodon#29087)
@ClearlyClaire
Fix string interpolation for software updates admin mailer (mastodon#…
a239904 
…30035)
@mjankowski @ClearlyClaire
Add material design icons to admin/settings views (mastodon#27780)
32ead51 
Co-authored-by: Claire <[email protected]>
@mjankowski
Move JS source from packs to entrypoints (mastodon#30037)
3f68875
@kmycode
Merge remote-tracking branch 'parent/main' into upstream-20240424
32a8f36
@kmycode kmycode added this to the kb12.0 milestone Apr 23, 2024
@kmycode kmycode merged commit 96a82cd into kb_development Apr 24, 2024
51 checks passed
@kmycode kmycode deleted the upstream-20240424 branch April 24, 2024 03:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
upstream
Projects
None yet
Milestone
kb12.0
Development

Successfully merging this pull request may close these issues.
5 participants
@kmycode @mjankowski @timothyjrogers @ClearlyClaire @ThisIsMissEm