Merge branch 'master' into 'feature/remove-tests'

# Conflicts:
#   gitlab-ci-1.2.yml

.gitlab-ci.yml

 variables:
   DISABLE_FUNCTIONAL: 1
   DISABLE_ACCEPTANCE: 1
+  DISABLE_PHP_5_5: 1
 
 include: 'https://gitlab.com/wpdesk/gitlab-ci/raw/master/gitlab-ci-1.2.yml'

gitlab-ci-1.2.yml

@@ -65,7 +65,7 @@ stages:
     - master
 
 .template: &job-test-unit-template-fast
-  <<: *job-test-unit-template
+  <<: *job-test-template
   script:
     - echo ${WPDESK_CI_VERSION}
     - ls -l
@@ -386,9 +386,13 @@ deploy to demo:
 
 deploy to repository:
   <<: *job-deploy-template
+  cache:
+    paths:
+      - svn-repository
   script:
     - echo ${WPDESK_CI_VERSION}
-    - /tmp/deploy_repository.sh ${CI_PROJECT_NAME} ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME} /tmp/svn-repository/${CI_PROJECT_NAME}
+    - mkdir -p ${CI_PROJECT_DIR}/svn-repository
+    - /tmp/deploy_repository.sh ${CI_PROJECT_NAME} ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME} ${CI_PROJECT_DIR}/svn-repository/${CI_PROJECT_NAME}
     - 'curl -X POST --data-urlencode "payload={\"text\": \"Projekt <https://gitlab.com/wpdesk/${CI_PROJECT_NAME}|${CI_PROJECT_NAME}> zdeployowany do repozytorium WP w wersji ${CI_COMMIT_REF_NAME}\", }" https://hooks.slack.com/services/${SLACK_AUTH}'
   environment:
     name: wordpress repository

gitlab-ci-free.yml

+include: 'https://gitlab.com/wpdesk/gitlab-ci/raw/master/gitlab-ci-1.2.yml'
+
+
+deploy to repository:
+  when: on_success
\ No newline at end of file

gitlab-ci-shop.yml

+include: 'https://gitlab.com/wpdesk/gitlab-ci/raw/master/gitlab-ci-1.2.yml'
+
+deploy to shop:
+  when: on_success
+
+deploy to demo:
+  when: on_success
\ No newline at end of file