kyori19 ae2190b9a5 Merge remote-tracking branch 'mastodon/main' into custom/quote ...

# Conflicts:
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/components/status_content.js
#	app/javascript/mastodon/containers/timeline_container.js
#	app/javascript/mastodon/features/status/components/detailed_status.js
#	app/javascript/styles/mastodon/components.scss

2022-11-15 01:48:20 +00:00

..

chewy

…

controllers

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

helpers

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

javascript

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

lib

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

mailers

…

models

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

policies

Fix GET /api/v1/admin/ip_blocks/:id (#20207)

2022-11-09 15:22:58 +01:00

presenters

Change sign-in banner to reflect disabled or moved account status (#19773)

2022-11-05 18:28:13 +01:00

serializers

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

services

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

validators

Fix error when uploading malformed CSV import (#19509)

2022-10-28 23:30:44 +02:00

views

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

workers

Change incoming activity processing to happen in ingress queue (#20264)

2022-11-10 14:21:51 +01:00