Merge pull request #2892 from ClearlyClaire/glitch-soc/merge-upstream #1683

Job	Run time
build (production)	4m 14s
build (test)	5m 1s
test (3.2)	6m 38s
Libvips tests (3.2)	4m 40s
End to End testing (3.2)	3m 42s
test (.ruby-version)	6m 54s
Libvips tests (.ruby-version)	2m 45s
Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 53s
End to End testing (.ruby-version)	2m 29s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 59s
Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:...	2m 58s
Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2)	3m 4s
	49m 17s

Provide feedback