Merge branch 'develop' into staging

2017-04-05 16:52:07 +02:00 · 2017-04-05 16:52:07 +02:00 · 0d90eb3fd5
commit 0d90eb3fd5
parent a1885c86ce 31775b70d6
1 changed files with 6 additions and 0 deletions
--- a/circle.yml
+++ b/circle.yml
@ -1,3 +1,9 @@
 database:
  override:
    - bundle exec rake db:drop db:create db:migrate RAILS_ENV=test
+
+deployment:
+  staging:
+    branch: staging
+    commands:
+      - bundle exec rake deploy_ha