Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix

Conflicts:
	config/unicorn.rb.example
This commit is contained in:
Dmitriy Zaporozhets 2013-02-13 15:11:26 +02:00
commit 2ea12ff663

View file

@ -2,7 +2,7 @@
# note that config/gitlab.yml web path should also be changed # note that config/gitlab.yml web path should also be changed
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
app_dir = "/home/git/gitlab/" app_dir = File.expand_path '../../', __FILE__
worker_processes 2 worker_processes 2
working_directory app_dir working_directory app_dir