Merge branch '6-9-stable' into 6-9-stable-ee

Conflicts: config/software/gitlab-rails.rb

Merge branch '6-9-stable' into 6-9-stable-ee
Conflicts: config/software/gitlab-rails.rb
Jacob Vosmaer
2 parents 94847a49 b39a2add
Showing 1 changed file with 6 additions and 0 deletions Show diff stats
README.md
@@ -62,6 +62,12 @@ You can login as an admin user with username `root` and password `5iveL!fe`.
  
 ### Common installation problems
  
+#### GitLab is unreachable in my browser
+
+Try [specifying](#configuring-the-external-url-for-gitlab) an `external_url` in
+`/etc/gitlab/gitlab.rb`. Also check your firewall settings; port 80 (HTTP) or
+443 (HTTPS) might be closed on your GitLab server.
+
 #### Reconfigure freezes at `ruby_block[supervise_redis_sleep] action run`
  
 This happens when Runit has not been installed succesfully during `gitlab-ctl
...	...	@@ -62,6 +62,12 @@ You can login as an admin user with username `root` and password `5iveL!fe`.
62	62
63	63	### Common installation problems
64	64
	65	+#### GitLab is unreachable in my browser
	66	+
	67	+Try [specifying](#configuring-the-external-url-for-gitlab) an `external_url` in
	68	+`/etc/gitlab/gitlab.rb`. Also check your firewall settings; port 80 (HTTP) or
	69	+443 (HTTPS) might be closed on your GitLab server.
	70	+
65	71	#### Reconfigure freezes at `ruby_block[supervise_redis_sleep] action run`
66	72
67	73	This happens when Runit has not been installed succesfully during `gitlab-ctl
...	...