Merge branch 'revert-54e73646' into 'master'

Revert "Update .gitlab-ci.yml to possibly fix bug with frontendtesting."

See merge request !11
4 jobs for master in 3 minutes and 38 seconds