Merge pull request #2747 from ClearlyClaire/glitch-soc/merge-upstream #1362

Job	Run time
build (production)	3m 45s
build (test)	3m 42s
End to End testing (3.1)	6m 1s
test (3.1)	9m 39s
End to End testing (3.2)	6m 12s
Libvips tests (3.1)	1m 53s
Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 5s
test (3.2)	9m 6s
End to End testing (.ruby-version)	6m 15s
Libvips tests (3.2)	1m 45s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	2m 35s
test (.ruby-version)	11m 11s
Libvips tests (.ruby-version)	1m 52s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 56s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	3m 14s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 7s
	1h 16m 18s

Provide feedback