Commit 2ea12ff6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

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

Conflicts:
	config/unicorn.rb.example
parents 95e4217a 5e287106
...@@ -2,7 +2,7 @@ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment