Merge pull request #3847 from boldt/unicorn-to-puma

Fixed forgotten unicorn to puma in a comment.

Merge pull request #3847 from boldt/unicorn-to-puma
Fixed forgotten unicorn to puma in a comment.
Dmitriy Zaporozhets
2 parents 298d0897 f64874c1
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/gitlab.yml.example
@@ -19,7 +19,7 @@ production: &amp;base
     port: 80
     https: false
     # Uncomment and customize to run in non-root path
-    # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
+    # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
     # relative_url_root: /gitlab
  
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
...	...	@@ -19,7 +19,7 @@ production: &base
19	19	port: 80
20	20	https: false
21	21	# Uncomment and customize to run in non-root path
22		- # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
	22	+ # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
23	23	# relative_url_root: /gitlab
24	24
25	25	# Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
...	...