Merge branch '87-deploy-on-stage-on-every-merge' into 'develop'

Resolve "Deploy on stage on every merge."

Closes #87

See merge request !92

.gitlab-ci.yml

@@ -56,7 +56,6 @@ layout:
         - ssh-keyscan -p 22179 extensions.typo3.org >> /root/.ssh/known_hosts
     script:
         - VERSION=4.0.0-alpine ./.gitlab-ci/scripts/deployer.sh -f/src/.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
-    when: manual
     dependencies:
         - layout
     except:
@@ -67,6 +66,7 @@ deploy-master:
     environment:
         name: master
         url: https://extensions.typo3.org/
+    when: manual
     only:
         - master