Merge branch 'master' into 4.0-stable

6da617f8 · David Haynes · 5bba2fd6 · 23b97ae5 · 6da617f8
Commit 6da617f8 authored Feb 03, 2018 by David Haynes 🙆
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,8 @@ build:
      - build/js
      - build/css
      - build/fonts
+  only:
+    - master

 pages:
  stage: deploy
@@ -25,3 +27,5 @@ pages:
  artifacts:
    paths:
      - public
+  only:
+    - master