kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix typos and grammar

Browse source 
[ci skip]
This commit is contained in:
Achilleas Pipinellis 2016-02-10 12:43:19 +02:00
parent f81495b1e1
commit 464cea7d48
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/application.rb
View file

@ -53,7 +53,8 @@ module Gitlab
config.action_view.sanitized_allowed_protocols = %w(smb) config.action_view.sanitized_allowed_protocols = %w(smb)
# Relative URL support # Relative URL support
# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this. # WARNING: We recommend using an FQDN to host GitLab in a root path instead
# of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path # Uncomment and customize the following line to run in a non-root path
# #

3
config/gitlab.yml.example
View file

@ -39,7 +39,8 @@ production: &base
# ssh_host: ssh.host_example.com # ssh_host: ssh.host_example.com
# Relative URL support # Relative URL support
# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this. # WARNING: We recommend using an FQDN to host GitLab in a root path instead
# of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path # Uncomment and customize the following line to run in a non-root path
# #

3
config/unicorn.rb.example
View file

@ -12,7 +12,8 @@
# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# Relative URL support # Relative URL support
# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this. # WARNING: We recommend using an FQDN to host GitLab in a root path instead
# of using a relative URL.
# Documentation: http://doc.gitlab.com/ce/install/relative_url.html # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
# Uncomment and customize the following line to run in a non-root path # Uncomment and customize the following line to run in a non-root path
# #

2
doc/install/installation.md
View file

@ -487,7 +487,7 @@ You can use `sudo service gitlab start` and `sudo service gitlab stop` to start
### Relative URL support ### Relative URL support
See the [Relative URL documentation](relative_url.md) for more information on See the [Relative URL documentation](relative_url.md) for more information on
how to set this up. how to configure GitLab with a relative URL.
### Using HTTPS ### Using HTTPS

15
doc/install/relative_url.md
View file

@ -9,15 +9,15 @@ first time._
--- ---
While it is recommended to install GitLab in its own (sub)domain, sometimes While it is recommended to install GitLab on its own (sub)domain, sometimes
this is not possible due to a variety of reasons. In that case, GitLab can also this is not possible due to a variety of reasons. In that case, GitLab can also
be installed under a relative URL, for example `https://example.com/gitlab`. be installed under a relative URL, for example `https://example.com/gitlab`.
There is no limit as to how much deeply nested the relative URL can be. For There is no limit to how deeply nested the relative URL can be. For example you
example you could serve GitLab under `/foo/bar/gitlab/git` without any issues. could serve GitLab under `/foo/bar/gitlab/git` without any issues.
Note that by changing the URL on an existing GitLab installation, all remote Note that by changing the URL on an existing GitLab installation, all remote
URLS will change, so you'll have to manually edit them in any local repository URLs will change, so you'll have to manually edit them in any local repository
that points to your GitLab instance. that points to your GitLab instance.
--- ---
@ -47,8 +47,7 @@ See the [requirements](requirements.md) document for more information.
_**Note:** _**Note:**
Do not make any changes to your web server configuration file regarding Do not make any changes to your web server configuration file regarding
relative URL. The relative URL support is basically implemented by GitLab relative URL. The relative URL support is implemented by GitLab Workhorse._
Workhorse._
--- ---
@ -109,7 +108,7 @@ Make sure to follow all steps below:
gitlab-workhorse setting as needed. gitlab-workhorse setting as needed.
1. After all the above changes recompile the assets. This is an important task 1. After all the above changes recompile the assets. This is an important task
and will take some time to complete depending on the server resources. and will take some time to complete depending on the server resources:
``` ```
cd /home/git/gitlab cd /home/git/gitlab
@ -121,7 +120,7 @@ Make sure to follow all steps below:
### Disable relative URL in GitLab ### Disable relative URL in GitLab
To disable the relative URL, follow the same steps as above and set up the To disable the relative URL, follow the same steps as above and set up the
GitLab URL to a one that doesn't contain a relative path. GitLab URL to one that doesn't contain a relative path.
[omnibus-rel]: http://doc.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab" [omnibus-rel]: http://doc.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab"
[restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab" [restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"