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

Update/imastodon with upstream v4.3.0 #475

Merged
merged 975 commits into from
Jan 10, 2025
Merged

Update/imastodon with upstream v4.3.0 #475

merged 975 commits into from
Jan 10, 2025
+59,798 −36,920

Conversation

takayamaki
Copy link
Member

No description provided.

renovate bot and others added 30 commits December 29, 2023 10:17
@renovate
Update dependency brakeman to v6.1.1 (mastodon#28487)
3fbfc50 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.142.0 (mastodon#28479)
f6f85b9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency tzinfo-data to v1.2023.4 (mastodon#28478)
b01a027 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency classnames to v2.5.0 (mastodon#28498)
87bf85f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ws to v8.16.0 (mastodon#28504)
f7f7236 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update github/codeql-action action to v3 (mastodon#28495)
63901bb 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Performance/StringIdentifierArgument cop (mastodon#28508)
128c5b7
@renovate
Update dependency core-js to v3.35.0 (mastodon#28518)
54ed015 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency nokogiri to v1.16.0 (mastodon#28513)
5fd16c3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28481)
7df9c4f 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency rubocop-performance to v1.20.1 (mastodon#28492)
fd57e40 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use shorter attribute query methods in Announcement (mastodon#28474)
ba5f659
@logicalmoody
Fix destructive actions in dropdowns not using error color in light t…
3599622 
…heme (mastodon#28484)
@ClearlyClaire
Fix random NoMethodError errors on cached CustomFilter objects (m…
fcfdead 
…astodon#28521)
@ClearlyClaire
Change media to be hidden/blurred by default in report modal (mastodo…
6374358 
…n#28522)
@devcamke
Update copyright year to 2024 (mastodon#28550)
ac588da
@vmstan
Add wget to base Dockerfile (mastodon#28548)
c652b0e
@renovate
Update dependency mime-types to v3.5.2 (mastodon#28556)
e082a98 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update devDependencies (non-major) (mastodon#28543)
663a7b6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#28542)
629152a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update babel monorepo to v7.23.7 (mastodon#28528)
c234068 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency classnames to v2.5.1 (mastodon#28524)
1982137 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@vmstan
Fix OCR when using S3/CDN for assets (mastodon#28551)
fdec8d7
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28529)
0374e11 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency eslint-plugin-jsdoc to v47 (mastodon#28541)
cd09be0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix streaming API redirection ignoring the port of `streaming_api_bas…
1184887 
…e_url` (mastodon#28558)
@ClearlyClaire
Fix loading local accounts with extraneous domain part in WebUI (mast…
65ea097 
…odon#28559)
@mjankowski
Update @typescript-eslint/parser to version 6.17.0 (mastodon#28218)
3944b12
@renovate
Update dependency sass to v1.69.7 (mastodon#28570)
c2b4588 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency puma to v6.4.1 (mastodon#28569)
8c5d3e5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
andypiper and others added 23 commits January 22, 2024 11:11
@andypiper
docs: update FEDERATION.md to more closely follow FEP conventions. (m…
9620b21 
…astodon#28838)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28827)
76e383e 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Use ruby version 3.2.3 (mastodon#28817)
5efb00d
@mjankowski
Move controller->request specs for api/v1/statuses/* (mastodon#28818)
7ecf7f5
@mjankowski
Add Account.matches_uri_prefix scope and use in activitypub/followe…
18004bf 
…rs_synchronizations controller (mastodon#28820)
@ClearlyClaire
Add notification email on invalid second authenticator (mastodon#28822)
e2d9635
@mjankowski
Fix Rails/WhereExists cop in app/validators (mastodon#28854)
67f54c4
@mjankowski
Fix Rails/WhereExists cop in lib/tasks (mastodon#28852)
defe5f4
@mjankowski
Add coverage for Tag.recently_used scope (mastodon#28850)
b0207d7
@mjankowski
N+1 fixes for CLI maintenance command (mastodon#28847)
d03fe2b
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28857)
78ee145 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Fix Rails/WhereExists cop in app/services (mastodon#28853)
ceade78
@mjankowski
Eager loading fixes for api/ controllers (mastodon#28848)
c0e8e45
@renovate @renchap
chore(deps): update devdependencies (non-major) (mastodon#28840)
61a0ec6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
@Gargron
Fix search form re-rendering spuriously in web UI (mastodon#28876)
01ce9df
@Gargron
Add annual reports for accounts (mastodon#28693)
5b1eb09
@mjankowski
Simplify AccountSummary.filtered query generation (mastodon#28868)
599bc69
@mjankowski
Fix Rails/WhereExists cop in app/models (mastodon#28863)
9d413cb
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28875)
a34d27c 
Co-authored-by: GitHub Actions <[email protected]>
@takayamaki
Merge commit '93e4cdc31' into update/imastodon
6714e09
@takayamaki
Merge commit '8f94502e7' into update/imastodon
89291ba
@takayamaki
Merge commit 'a34d27c18' into update/imastodon
c34d41c
@takayamaki
Merge remote-tracking branch 'imas/imastodon' into update/imastodon
3f223ed
@takayamaki takayamaki marked this pull request as ready for review January 9, 2025 03:23
@takayamaki
Copy link
Member Author

bundler auditが落ちてるけどマージする

@takayamaki takayamaki merged commit 367a509 into imastodon Jan 10, 2025
50 of 51 checks passed
@takayamaki takayamaki deleted the update/imastodon branch January 10, 2025 11:57
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.