diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-13 17:11:26 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-13 17:11:26 +0400 |
| commit | 2ea12ff6632ce60cbd26200c7cd1306229ec21ec (patch) | |
| tree | 0597d4ab2ac6259821121f9653718f4c25fb50ac /config | |
| parent | 95e4217a2b856a9c755f893a267e0ead1ce17d1c (diff) | |
| parent | 5e28710692dd1eb872b6c25e674c81c0593ed0ac (diff) | |
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
Conflicts:
config/unicorn.rb.example
Diffstat (limited to 'config')
| -rw-r--r-- | config/unicorn.rb.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 29b7146c7df..123033486f4 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -2,7 +2,7 @@ # note that config/gitlab.yml web path should also be changed # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" -app_dir = "/home/git/gitlab/" +app_dir = File.expand_path '../../', __FILE__ worker_processes 2 working_directory app_dir |