diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-14 11:38:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-14 11:38:08 +0000 |
| commit | 962f7a312623e8ab34efeaf098701c89e633b68c (patch) | |
| tree | b743290e5120b9e6923d084768995cad8f6ef306 /config.yml.example | |
| parent | 785484d2ae5af1254fbb3baa2775acc930e85d88 (diff) | |
| parent | 7fb2d88454e703d1a4d51e87a9276b3e0ef4809d (diff) | |
| download | gitlab-shell-2.6.9.tar.gz | |
Merge branch 'remove-trailing-slashes' into 'master'
v2.6.9
Remove trailing slashes from gitlab_url
They do not play nice with gitlab-workhorse (or rather Golang net/http
DefaultServemux).
See merge request !35
Diffstat (limited to 'config.yml.example')
| -rw-r--r-- | config.yml.example | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.yml.example b/config.yml.example index e7ecc01..a7e8d8a 100644 --- a/config.yml.example +++ b/config.yml.example @@ -6,14 +6,14 @@ # GitLab user. git by default user: git -# Url to gitlab instance. Used for api calls. Should end with a slash. -# Default: http://localhost:8080/ +# Url to gitlab instance. Used for api calls. +# Default: http://localhost:8080 # You only have to change the default if you have configured Unicorn # to listen on a custom port, or if you have configured Unicorn to # only listen on a Unix domain socket. For Unix domain sockets use -# "http+unix://<urlquoted-path-to-socket>/", e.g. -# "http+unix://%2Fpath%2Fto%2Fsocket/" -gitlab_url: "http://localhost:8080/" +# "http+unix://<urlquoted-path-to-socket>", e.g. +# "http+unix://%2Fpath%2Fto%2Fsocket" +gitlab_url: "http://localhost:8080" # See installation.md#using-https for additional HTTPS configuration details. http_settings: |