Commit 2ea12ff6632ce60cbd26200c7cd1306229ec21ec
Exists in
master
and in
4 other branches
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mik…
…ew-unicorn-app-dir-fix Conflicts: config/unicorn.rb.example
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
config/unicorn.rb.example
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | # note that config/gitlab.yml web path should also be changed | 2 | # note that config/gitlab.yml web path should also be changed |
| 3 | # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" | 3 | # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" |
| 4 | 4 | ||
| 5 | -app_dir = "/home/git/gitlab/" | 5 | +app_dir = File.expand_path '../../', __FILE__ |
| 6 | worker_processes 2 | 6 | worker_processes 2 |
| 7 | working_directory app_dir | 7 | working_directory app_dir |
| 8 | 8 |