Fixed comments for running gitlab in a non-root path

- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server) - If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible

Fixed comments for running gitlab in a non-root path
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server) - If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
Crom (Thibaut CHARLES)
1 parent d618a5fe
Showing 3 changed files with 9 additions and 3 deletions Show diff stats
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example
@@ -71,10 +71,12 @@ module Gitlab
  
     # Uncomment and customize the last line to run in a non-root path
     # WARNING: This feature is known to work, but unsupported
-    # Note that three settings need to be changed for this to work.
+    # Note that four 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'] = "/gitlab"
+    # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
+    # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
     #
     # config.relative_url_root = "/gitlab"
  
@@ -21,10 +21,12 @@ production: &amp;base
  
     # Uncomment and customize the last line to run in a non-root path
     # WARNING: This feature is known to work, but unsupported
-    # Note that three settings need to be changed for this to work.
+    # Note that four 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'] = "/gitlab"
+    # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
+    # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
     #
     # relative_url_root: /gitlab
  
@@ -10,10 +10,12 @@
  
 # Uncomment and customize the last line to run in a non-root path
 # WARNING: This feature is known to work, but unsupported
-# Note that three settings need to be changed for this to work.
+# Note that four 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'] = "/gitlab"
+# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
+# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
 #
 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
...	...	@@ -71,10 +71,12 @@ module Gitlab
71	71
72	72	# Uncomment and customize the last line to run in a non-root path
73	73	# WARNING: This feature is known to work, but unsupported
74		- # Note that three settings need to be changed for this to work.
	74	+ # Note that four settings need to be changed for this to work.
75	75	# 1) In your application.rb file: config.relative_url_root = "/gitlab"
76	76	# 2) In your gitlab.yml file: relative_url_root: /gitlab
77	77	# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
	78	+ # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
	79	+ # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
78	80	#
79	81	# config.relative_url_root = "/gitlab"
80	82
...	...
...	...	@@ -21,10 +21,12 @@ production: &base
21	21
22	22	# Uncomment and customize the last line to run in a non-root path
23	23	# WARNING: This feature is known to work, but unsupported
24		- # Note that three settings need to be changed for this to work.
	24	+ # Note that four settings need to be changed for this to work.
25	25	# 1) In your application.rb file: config.relative_url_root = "/gitlab"
26	26	# 2) In your gitlab.yml file: relative_url_root: /gitlab
27	27	# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
	28	+ # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
	29	+ # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
28	30	#
29	31	# relative_url_root: /gitlab
30	32
...	...
...	...	@@ -10,10 +10,12 @@
10	10
11	11	# Uncomment and customize the last line to run in a non-root path
12	12	# WARNING: This feature is known to work, but unsupported
13		-# Note that three settings need to be changed for this to work.
	13	+# Note that four settings need to be changed for this to work.
14	14	# 1) In your application.rb file: config.relative_url_root = "/gitlab"
15	15	# 2) In your gitlab.yml file: relative_url_root: /gitlab
16	16	# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
	17	+# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
	18	+# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
17	19	#
18	20	# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
19	21
...	...