Merge branch 'master' of github.com:gitlabhq/gitlabhq
Conflicts: resque.sh
This commit is contained in:
commit
fea6494666
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue