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 /lib/gitlab_config.rb | |
| parent | 785484d2ae5af1254fbb3baa2775acc930e85d88 (diff) | |
| parent | 7fb2d88454e703d1a4d51e87a9276b3e0ef4809d (diff) | |
| download | gitlab-shell-962f7a312623e8ab34efeaf098701c89e633b68c.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 'lib/gitlab_config.rb')
| -rw-r--r-- | lib/gitlab_config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb index caca176..831f0e3 100644 --- a/lib/gitlab_config.rb +++ b/lib/gitlab_config.rb @@ -24,7 +24,7 @@ class GitlabConfig end def gitlab_url - @config['gitlab_url'] ||= "http://localhost/" + (@config['gitlab_url'] ||= "http://localhost:8080").sub(%r{/*$}, '') end def http_settings |