Merge branch '141-failing-pipeline-after-merge-to-master-but-works-after-retry' into 'master'

Resolve "Failing pipeline after merge to master (but works after retry)"

Closes #141

See merge request hifis/hifis.net!250

.gitlab-ci.yml

@@ -117,18 +117,6 @@ build:latest:
   image: ruby:latest
   allow_failure: true
 
-# Job runs jekyll build latest dependencies,
-# puts everything in a sub-directory while specifying baseurl.
-build:production:subpath:
-  <<: *builds
-  <<: *production_before_script
-  image: ruby:latest
-  variables:
-    <<: *common_variables
-    SUBPATH: /$CI_PROJECT_NAME
-  extends:
-    - .artifacts_extension
-
 # Job runs jekyll build with production dependencies,
 # puts everything in a sub-directory as required for review apps.
 build:production:review-apps:
@@ -158,8 +146,8 @@ test:htmlproofer:
 test:htmlproofer:subpath:
   <<: *tests
   dependencies:
-    - build:production:subpath
-  needs: ["build:production:subpath"]
+    - build:production:review-apps
+  needs: ["build:production:review-apps"]
 
 # Job tests external links in addition to test:htmlproofer job.
 test:htmlproofer:external_links:
@@ -216,20 +204,3 @@ include:
   - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
   - template: 'Verify/Accessibility.gitlab-ci.yml'
   - local: '/.gitlab/ci/a11y.gitlab-ci.yml'
-
-pages:
-  image: alpine:latest
-  stage: deploy
-  variables:
-    GIT_STRATEGY: none
-  script:
-    - mv public/$CI_PROJECT_NAME/* public/.
-    - rmdir public/$CI_PROJECT_NAME
-  dependencies:
-    - build:production:subpath
-  needs: ["build:production:subpath"]
-  artifacts:
-    paths:
-      - public
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH