Merge pull request #2559 from ClearlyClaire/glitch-soc/merge-upstream #799

Job	Run time
build (production)	4m 8s
build (test)	4m 15s
End to End testing (3.0)	4m 48s
Elastic Search integration testing (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 13s
test (3.0)	10m 19s
End to End testing (3.1)	4m 35s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 40s
End to End testing (.ruby-version)	4m 54s
test (3.1)	10m 34s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 15s
test (.ruby-version)	12m 15s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 16s
	1h 5m 12s

Provide feedback