Merge branch 'master' into 'master'

Fix Gitlab Pages deployment wrong if a project has a public folder

See merge request gitlab-org/gitlab!74952

lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml

@@ -9,6 +9,7 @@ pages:
   script:
     - mkdir .public
     - cp -r * .public
+    - rm -rf public
     - mv .public public
   artifacts:
     paths: