deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	config/unicorn.rb.example
This commit is contained in:
Dmitriy Zaporozhets 2013-02-13 15:11:26 +02:00
parent 95e4217a2b 5e28710692
commit 2ea12ff663
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/unicorn.rb.example
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