Merge branch 'develop' into staging

This commit is contained in:
Mathieu Magnin 2017-04-13 09:55:02 +02:00
commit 5a5052b14b

View file

@ -56,6 +56,9 @@ jobs:
- run: - run:
name: Run haml-lint name: Run haml-lint
command: bundle exec haml-lint app/views/ command: bundle exec haml-lint app/views/
- add_ssh_keys:
fingerprints:
- "0a:67:42:7d:7e:b7:e1:3c:48:8f:bf:68:10:51:a8:44"
- deploy: - deploy:
command: | command: |
if [ "${CIRCLE_BRANCH}" == "staging" ]; then if [ "${CIRCLE_BRANCH}" == "staging" ]; then