Tristan/restore post merge ci

This restores the post-merge CI which was backed out last week.

Now that we have CI down to a decent ~20 minutes for the test jobs, we can benefit slightly from having the CI run in target branches as well as in pre-merge on the merge request branches.

This also moves the expensive code_quality job to the test phase which should make the overall pipelines complete a bit faster.