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 #1564

Merged
merged 45 commits into from
Jan 23, 2025
Merged

Merge/mastodon main branch #1564

merged 45 commits into from
Jan 23, 2025

Conversation

S-H-GAMELINKS
Copy link
Owner

No description provided.

mjankowski and others added 30 commits January 16, 2025 14:58
@mjankowski
Collect errors in setup rake task (mastodon#33603)
69b8a0b
@renovate
Update opentelemetry-ruby (non-major) (mastodon#33613)
da20877 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.178.0 (mastodon#33611)
9e2f930 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency concurrent-ruby to v1.3.5 (mastodon#33610)
29b355b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Move clear environment portion of mastodon:setup to private method (m…
a191414 
…astodon#33616)
@mjankowski
Add coverage for AnnualReport.prepare method (mastodon#33618)
3af6739
@c960657
API for updating attribution domains (mastodon#32730)
a3baae0
@renovate
Update formatjs monorepo (mastodon#33627)
febdfef 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Change activity distribution error handling to skip retrying for dele…
092e60e 
…ted accounts (mastodon#33617)
@renovate
Update dependency tzinfo-data to v1.2025.1 (mastodon#33625)
531ca4b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33626)
1c23ebd 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Migrate visibility interaction checks on statuses to request spec (ma…
5be938e 
…stodon#33622)
@ClearlyClaire
Revert "Update dependency aws-sdk-s3 to v1.178.0 (mastodon#33611)" (m…
b37e48d 
…astodon#33628)
@ClearlyClaire
Further harden the warnings against changing encryption secrets (mast…
ab4874f 
…odon#33631)
@mjankowski
Update CONTRIBUTING doc with various clarifications (mastodon#33517)
bc63f2b
@larouxn
Fix broken CONTRIBUTING link in DEVELOPMENT (mastodon#33637)
4bd969e
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33643)
329a9e1 
Co-authored-by: GitHub Actions <[email protected]>
@Gargron
Add warning when selected and detected language is different in web UI (
8962f11 
mastodon#33042)
@ClearlyClaire
Fix re-encoding of high-framerate VFR videos with FFmpeg 6+ (mastodon…
ac59ed3 
…#33634)
@renovate
Update dependency i18n to v1.14.7 (mastodon#33650)
a0c76f6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency nokogiri to v1.18.2 (mastodon#33651)
2deab34 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update formatjs monorepo (mastodon#33652)
7f866da 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency selenium-webdriver to v4.28.0 (mastodon#33667)
004e120 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use bundler version 2.6.3 (mastodon#33658)
7543c90
@mjankowski
Use expect for nested params in auth/setup#update (mastodon#33657)
45149cd
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33668)
9e90248 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix opening modals losing some location parameters (mastodon#33670)
4ebdfed
@Gargron
Change design of edit media modal in web UI (mastodon#33516)
11786f1
@ClearlyClaire
Change notifications from moderators to not be filtered (mastodon#33654)
3dcf5e1
@ShadowJonathan
Order emoji categories (in admin interface) by name (mastodon#33630)
e380e80
renovate bot and others added 15 commits January 22, 2025 08:34
@renovate
Update dependency irb to v1.15.1 (mastodon#33674)
2a6a418 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use expect for nested params in more controllers (mastodon#33675)
d2cc288
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33679)
38c27a7 
Co-authored-by: GitHub Actions <[email protected]>
@Gargron
Refactor <DomainPill> into TypeScript (mastodon#33680)
8b24085
@mjankowski
Use expect for nested params in settings/* controllers (mastodon#…
e155aab 
…33673)
@ShadowJonathan
Change first_of_value to first_of_hash, and add more test cases (m…
b18caff 
…astodon#33647)
@mjankowski
Use expect for api/v1 and api/web push subs controllers (mastodon#3…
607f65a 
…3682)
@ClearlyClaire
Fix WebUI crash when language detection code returns undefined (mas…
8dcfd3f 
…todon#33683)
@ClearlyClaire
Change mastodon:setup to prevent overwriting already-configured ser…
a6fc776 
…vers (mastodon#33684)
@mjankowski
Fix issue with saving empty fields values on profile update (mastodon…
4a9c49e 
…#33689)
@mjankowski
Fix issue with saving empty fields values on filter keyword updates (m…
8eee7ae 
…astodon#33691)
@ClearlyClaire
Fix language detection taking mentions and URLs into account (mastodo…
3178acc 
…n#33700)
@ClearlyClaire
Convert LanguageDropdown to a functional component (mastodon#33701)
db14604
@Gargron
Add information about alt text to alt text modal in web UI (mastodon#…
0885c31 
…33702)
@S-H-GAMELINKS
Merge remote-tracking branch 'mastodon/main' into merge/mastodon-main…
ed40fcc 
…-branch
@S-H-GAMELINKS S-H-GAMELINKS force-pushed the merge/mastodon-main-branch branch from a1164f5 to ed40fcc Compare January 23, 2025 13:48
@S-H-GAMELINKS S-H-GAMELINKS merged commit f7a23db into creatodon Jan 23, 2025
46 of 48 checks passed
@S-H-GAMELINKS S-H-GAMELINKS deleted the merge/mastodon-main-branch branch January 23, 2025 14:24
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.
7 participants
@S-H-GAMELINKS @mjankowski @c960657 @ClearlyClaire @larouxn @Gargron @ShadowJonathan