Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 66e10f05 9e86f3b1
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
config/gitlab.yml.example
@@ -18,6 +18,7 @@ production: &amp;base
     host: localhost
     port: 80
     https: false
+    # WARNING: This feature is no longer supported
     # Uncomment and customize to run in non-root path
     # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
     # relative_url_root: /gitlab
...	...	@@ -18,6 +18,7 @@ production: &base
18	18	host: localhost
19	19	port: 80
20	20	https: false
	21	+ # WARNING: This feature is no longer supported
21	22	# Uncomment and customize to run in non-root path
22	23	# Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
23	24	# relative_url_root: /gitlab
...	...