Merge pull request #3492 from alphagov/oops-actually-complete-upgrade… #4252

Job	Run time
test-ruby-matrix (4, 0)	2m 26s
test-ruby-matrix (4, 1)	3m 1s
test-ruby-matrix (4, 2)	3m 11s
test-ruby-matrix (4, 3)	2m 17s
CodeQL SAST scan / Analyze	1m 41s
Dependency Review scan / dependency-review-push	7s
Dependency Review scan / dependency-review-pr	0s
Lint JavaScript / Run Standardx	10s
Lint Ruby / Run RuboCop	14s
Lint SCSS / Run Stylelint	9s
Security Analysis / Run Brakeman	22s
Test JavaScript / Run Jasmine	41s
Test Ruby	1s
	14m 20s

Provide feedback