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 mastodon and main #23

Merged
merged 1,086 commits into from
Jul 11, 2023
Merged

merge upstream mastodon and main #23

merged 1,086 commits into from
Jul 11, 2023

Conversation

toufali
Copy link
Collaborator

@toufali toufali commented Jul 11, 2023

No description provided.

mjankowski and others added 30 commits May 31, 2023 20:01
@mjankowski
Silence output to stdout during cli specs (mastodon#25211)
b0104e4
@renchap
Disable some metrics cops (mastodon#25215)
b7d995c
@mjankowski
Remove unused Settings::Extend module (mastodon#25214)
00c2223
@renchap
Upgrade react-intl (mastodon#24906)
44cd88a
@c960657 @ClearlyClaire
Translate CW, poll options and media descriptions (mastodon#24175)
6905746 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@nschonni
Add fix/lint helper dev targets (mastodon#23561)
d39bce9
@renchap
Fix prev/next buttons color in media viewer (mastodon#25231)
675672f
@ClearlyClaire
Fix multiple N+1s in ConversationsController (mastodon#25134)
2b45fec
@ClearlyClaire
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path compon…
b922ad7 
…ent (mastodon#25018)
@ClearlyClaire
Add a confirmation screen when suspending a domain (mastodon#25144)
e9385e9
@dependabot
Bump @types/jest from 29.5.1 to 29.5.2 (mastodon#25220)
b05bbd9 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 (mastodon#25222)
5a50983 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump aws-sdk-s3 from 1.122.0 to 1.123.0 (mastodon#25230)
e7e1b46 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mjankowski
Remove unused #hash_to_object method in SettingsHelper (mastodon#25213)
f84037a
@ClearlyClaire
Add missing primary keys to accounts_tags and statuses_tags (mast…
fe84f7e 
…odon#25210)
@danielmbrasil
Add test coverage for Mastodon::CLI::Accounts#refresh (mastodon#25196)
f906e21
@dependabot
Bump rspec-rails from 6.0.2 to 6.0.3 (mastodon#25223)
c15c8c7 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ClearlyClaire
Bump workbox from 6.6.1 to 7.0.0 (mastodon#25232)
dac460f
@renchap
Allow carets in URL search params (mastodon#25216)
942d850
@S-H-GAMELINKS
Fix using Date.now() instead of intl.now() (mastodon#25234)
b3f9a0d
@dependabot
Bump puma from 6.2.2 to 6.3.0 (mastodon#25229)
3182ecc 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@danielmbrasil
Add test coverage for Mastodon::CLI::Accounts#rotate (mastodon#25212)
2a35320
@mjankowski
Add CLI area progress bar helper (mastodon#25208)
35c1c3e
@nschonni
Update yarn.lock for audit issues (mastodon#25152)
b489c20
@mjankowski
Extract verify options method in search cli (mastodon#25121)
cd4f0fe
@dependabot
Bump sidekiq-scheduler from 5.0.2 to 5.0.3 (mastodon#25228)
d91607f 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ClearlyClaire
Add support for importing lists (mastodon#25203)
8884d1e
@ClearlyClaire
Fix overflow behavior of account rows (mastodon#25131)
5fae2de
@renchap
Fix /share and cleanup and reorganize frontend locale loading (mast…
b0780cf 
…odon#25240)
@j-f1
Fix spacing of middle dots in the detailed status meta section (masto…
acc419b 
…don#25247)
alfe and others added 20 commits July 8, 2023 11:11
@alfe
Rewrite <ShortNumber /> as FC and TS (mastodon#25492)
20e85c0
@renchap
Convert <DismissableBanner> to Typescript (mastodon#25582)
4534498
@krainboltgreene @emilweth
First pass at multi-database for read replica using Rails native adap…
e4cfe4b 
…ter (mastodon#25693)

Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
@Gargron
Add forwarding of reported replies to servers being replied to (masto…
93e8a15 
…don#25341)
@Gargron
Fix explore page being inaccessible when opted-out of trends in web UI (
ceeb2b8 
mastodon#25716)
@Gargron
Fix dropdowns being disabled for logged out users in web UI (mastodon…
a8edbcf 
…#25714)
@Gargron
Add toast with option to open post after publishing in web UI (mastod…
a7ca33a 
…on#25564)
@renchap
Remove unused missed_update state (mastodon#25832)
41a5055
@mjankowski
Admin mailer parameterization (mastodon#25759)
cf33028
@mjankowski
Remove unused NotificationMailer#digest preview (mastodon#25719)
d6b387a
@Gargron
Change label and design of sensitive and unavailable media in web UI (m…
338a0e7 
…astodon#25712)
@Gargron
Fix trend calculation working on too many items at a time (mastodon#2…
610cf6c 
…5835)
@Gargron
Change feed merge, unmerge and regeneration workers to use a replica (m…
a1f5188 
…astodon#25849)
@mjankowski
Refactor NotificationMailer to use parameterization (mastodon#25718)
f3fca78
@ClearlyClaire
Add forward_to_domains parameter to POST /api/v1/reports (mastodo…
c27b82a 
…n#25866)
@ClearlyClaire
Fix moderation interface for remote instances with a .zip TLD (mastod…
4b58519 
…on#25885)
@ClearlyClaire
Fix remote accounts being possibly persisted to database with incompl…
999c343 
…ete protocol values (mastodon#25886)
@ClearlyClaire
Fix filters not applying to explore tab (mastodon#25887)
af54bf5
@toufali
Merge remote-tracking branch 'upstream/main' into release-mozilla-social
069a0dd
@toufali
skip OIDC sign-out modal to redirect root
c61ae57
@toufali toufali changed the title Socialplat 36/merge upstream mastodon merge upstream mastodon Jul 11, 2023
@toufali toufali requested review from bakulf and aaga July 11, 2023 17:56
@toufali toufali changed the title merge upstream mastodon merge upstream mastodon and main Jul 11, 2023
@toufali toufali merged commit 8e2b2b0 into release-mozilla-social Jul 11, 2023
@toufali toufali mentioned this pull request Jul 11, 2023
Closed
@toufali toufali deleted the SOCIALPLAT-36/merge-upstream-mastodon branch February 26, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bakulf bakulf Awaiting requested review from bakulf

@aaga aaga Awaiting requested review from aaga

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone