Merge branch 'master' of github.com:domify/registry

Conflicts:
	config/deploy.rb
This commit is contained in:
Martin Lensment 2015-02-03 14:23:32 +02:00
commit 334ca7817b

View file

@ -161,11 +161,11 @@ end
namespace :delayed_job do
task stop: :environment do
queue %(echo "-----> Stopping delayed job"; cd #{deploy_to}/current; bin/delayed_job stop)
queue %(echo "-----> Stopping delayed job"; cd #{deploy_to}/current; RAILS_ENV=staging bin/delayed_job stop)
end
task start: :environment do
queue %(echo "-----> Starting delayed job"; cd #{deploy_to}/current; bin/delayed_job start)
queue %(echo "-----> Starting delayed job"; cd #{deploy_to}/current; RAILS_ENV=staging bin/delayed_job start)
end
end