Merge branch 'bwill/refactor-edit-on-gitlab-helper-again' into 'main'

Refactor edit_on_gitlab helper (again)

See merge request !2862
10 jobs for main in 25 minutes and 42 seconds (queued for 1 second)