Merge branch 'master' into fixes/api
This commit is contained in:
commit
c8b92a4be2
22 changed files with 201 additions and 233 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue