Merge branch 'master' of github.com:gitlabhq/gitlabhq

Conflicts:
	resque.sh
This commit is contained in:
Dmitriy Zaporozhets 2012-03-23 23:01:14 +02:00
commit fea6494666

View file

@ -1,2 +1,2 @@
mkdir tmp/pids mkdir -p tmp/pids
bundle exec rake environment resque:work QUEUE=post_receive RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid BACKGROUND=yes bundle exec rake environment resque:work QUEUE=post_receive RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid BACKGROUND=yes