Merge branch 'mastodon:main' into main #40

Job	Run time
build (production)	2m 13s
build (test)	2m 17s
test (3.1)	9m 6s
Libvips tests (3.1)	1m 48s
test (3.2)	9m 31s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 54s
Libvips tests (3.2)	2m 4s
test (.ruby-version)	10m 34s
End to End testing (3.1)	3m 0s
Libvips tests (.ruby-version)	2m 7s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 46s
End to End testing (3.2)	2m 40s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 44s
End to End testing (.ruby-version)	2m 28s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 54s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	2m 42s
	1h 1m 48s

Provide feedback