diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-23 23:01:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-23 23:01:14 +0200 |
| commit | fea64946662a6043ec96c53bf2982d4f51ca4879 (patch) | |
| tree | 3986c7423b50c92757f73d3eff27a0a4ad5dcfce | |
| parent | 255a9e0325471aa270a65201a0b43c77823faf06 (diff) | |
| parent | fd071b571798b979f36ceff67bb1e63d18e4630a (diff) | |
| download | gitlab-ce-fea64946662a6043ec96c53bf2982d4f51ca4879.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Conflicts:
resque.sh
| -rwxr-xr-x | resque.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resque.sh b/resque.sh index e6b403c5a3c..de5249f7d86 100755 --- a/resque.sh +++ b/resque.sh @@ -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 |