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

Conflicts: resque.sh

Merge branch 'master' of github.com:gitlabhq/gitlabhq
Conflicts: resque.sh
fea64946 · Dmitriy Zaporozhets · 255a9e03 · fd071b57 · fea64946
Commit fea64946 authored Mar 23, 2012 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

resque.sh resque.sh +1 -1

No files found.
--- a/resque.sh
+++ b/resque.sh
-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