Merge branch 'main' of https://github.com/mastodon/mastodon #961

Job	Run time
build (production)	4m 9s
build (test)	2m 59s
Testing search (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	5m 38s
test (3.0, 1)	3m 58s
Testing search (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 28s
End to End testing (3.0)	4m 48s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 0s
test (3.0, 2)	6m 23s
End to End testing (3.1)	3m 50s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2)	6m 6s
test (3.0, 3)	5m 6s
End to End testing (.ruby-version)	4m 0s
test (3.0, 4)	4m 22s
test (3.1, 1)	3m 51s
test (3.1, 2)	6m 3s
test (3.1, 3)	5m 38s
test (3.1, 4)	4m 15s
test (.ruby-version, 1)	4m 30s
test (.ruby-version, 2)	4m 57s
test (.ruby-version, 3)	6m 13s
test (.ruby-version, 4)	4m 24s
	1h 37m 38s

Provide feedback