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/mastodon main branch #1556

Merged
merged 47 commits into from
Dec 15, 2024
Merged

Merge/mastodon main branch #1556

merged 47 commits into from
Dec 15, 2024

Conversation

S-H-GAMELINKS
Copy link
Owner

No description provided.

mjankowski and others added 30 commits December 10, 2024 15:45
@mjankowski
Standardize uniqueness validation declaration on Mention (mastodon#…
e76aff7 
…33247)
@mjankowski
Add NOT NULL requirement to account columns on AccountPin (mastodon…
e4e35ab 
…#33244)
@renchap
Convert polls to Typescript / Immutable Records (mastodon#29789)
ded799f
@mjankowski
Add system spec for Admin::TermsOfService index view (mastodon#33250)
094e217
@mjankowski
Add coverage for admin/terms/drafts#update and admin/terms/generates#…
3936434 
…create actions (mastodon#33251)
@c960657
Support animated PNGs in media attachments (mastodon#28516)
a70ae28
@tribela
Handle rotation is not present in the video metadata (mastodon#33261)
9ba4c8e
@renovate
Update dependency rails to v7.2.2.1 (mastodon#33259)
bf4ad7e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @rails/ujs to v7.1.501 (mastodon#33258)
5e4ca08 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency react-redux to v9.2.0 (mastodon#33260)
32e23ef 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33262)
f12b3a9 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Add non-matching cases to Report#history spec (mastodon#33253)
f6daf73
@mjankowski
Avoid double request in admin/export_domain_allows controller spec (m…
f721e76 
…astodon#33255)
@mjankowski
Simplify model validation specs for CustomFilter (mastodon#33248)
ad68686
@filippog
Fix Vagrant failure to sync dangling symlinks (mastodon#28101)
3614e9a 
Co-authored-by: Filippo Giunchedi <[email protected]>
@ClearlyClaire
Change label of grouped favourite notification on private mentions (m…
a4560d9 
…astodon#31659)
@renchap
Fix voting on polls (mastodon#33266)
da279df
@ClearlyClaire
Fix processing of mentions for post edits with an existing correspond…
bcb3b62 
…ing silent mention (mastodon#33227)
@mjankowski
Fix Rails/ThreeStateBooleanColumn cop (mastodon#33269)
d6241f6
@ShadowJonathan
Fix bug where remote suspension causes local instance to remove remot…
315c170 
…e follows (mastodon#27588)
@mjankowski
Enable Rails/ReversibleMigration cop (mastodon#33264)
43702b9
@mjankowski
Remove app/views rubocop rule exception for haml-lint (mastodon#33270)
8fa89c2
@renovate
Update dependency react-select to v5.9.0 (mastodon#33279)
6445fac 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Disable Naming/VariableNumber cop in old migrations (mastodon#33274)
d56aa90
@mjankowski
Simplify model validation specs for Report (mastodon#33267)
b51e0bc
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33280)
e0a49af 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Remove unused model_have_error_on_field matcher (mastodon#33273)
4bf6af3
@mjankowski
Update deprecated enum style in older migrations (mastodon#32925)
708919e
@Gargron
Change search to use query params in web UI (mastodon#32949)
0636bcd
@mjankowski
Remove unused admin/terms_of_service routes (mastodon#33288)
bc5b9d9
mjankowski and others added 17 commits December 12, 2024 20:18
@mjankowski
Run optimize PNG on emoji sheet asset (mastodon#33281)
42f6a36
@robbkidd
don't start OTel traces with Redis spans (mastodon#33090)
d580607
@mjankowski
Fix long account username leaving container (mastodon#33286)
234af14
@mjankowski
Use touch_all for time column updates (mastodon#33295)
3c71ee9
@renovate
Update dependency sass to v1.83.0 (mastodon#33299)
ed33064 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency dotenv to v3.1.5 (mastodon#33298)
e2c7462 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency nokogiri to v1.17.2 (mastodon#33294)
148b1ff 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.176.1 (mastodon#33293)
4f2d060 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add coverage for Tag model validations on name/display_name (mastod…
1bd9306 
…on#33291)
@renovate
Update RuboCop (non-major) to v1.69.2 (mastodon#33283)
03aa095 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency irb to v1.14.2 (mastodon#33282)
92a4423 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33300)
7200f9d 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Convert settings/verifications controller spec to system spec (mast…
4130bda 
…odon#33285)
@mjankowski
Add missing NOT NULL requirement to small, indexed, valid data tabl…
efc85e3 
…es (mastodon#33284)
@mjankowski
Replace deprecated "github" format for stylelint on CI runs (mastodon…
a8edc82 
…#33292)
@nikclayton
Ensure datetime/date are serialized to correct format (mastodon#33086)
5cf3724
@S-H-GAMELINKS
Merge remote-tracking branch 'mastodon/main' into merge/mastodon-main…
45770ad 
…-branch
@S-H-GAMELINKS S-H-GAMELINKS merged commit 5ab5dcf into creatodon Dec 15, 2024
43 of 44 checks passed
@S-H-GAMELINKS S-H-GAMELINKS deleted the merge/mastodon-main-branch branch December 15, 2024 12:16
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.