Skip to content
Snippets Groups Projects
Commit 53990397 authored by Thomas Misilo's avatar Thomas Misilo Committed by Wes Gurney
Browse files

Changed wording in application.rb and gitlab.yml.example to match unicorn.rb....

Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path
parent c1451db0
No related branches found
No related tags found
1 merge request!4954Add support to configure webhook_timeout in gitlab.yaml
This commit is part of merge request !4954. Comments created here will be created in the context of that merge request.
Loading
Loading
@@ -70,11 +70,11 @@ module Gitlab
config.assets.version = '1.0'
 
# Uncomment and customize the last line to run in a non-root path
# WARNING: This feature is no longer supported
# WARNING: This feature is known to work, but unsupported
# Note that three settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
#
# config.relative_url_root = "/gitlab"
 
Loading
Loading
Loading
Loading
@@ -20,11 +20,11 @@ production: &base
https: false
 
# Uncomment and customize the last line to run in a non-root path
# WARNING: This feature is no longer supported
# WARNING: This feature is known to work, but unsupported
# Note that three settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
#
# relative_url_root: /gitlab
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment