Commit ff84530c authored by Jacob Vosmaer's avatar Jacob Vosmaer

Remove trailing slashes from gitlab_url

They do not play nice with gitlab-workhorse (or rather Golang net/http
DefaultServemux).
parent 1a75d086
......@@ -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
# 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:
......
......@@ -24,7 +24,7 @@ class GitlabConfig
end
def gitlab_url
@config['gitlab_url'] ||= "http://localhost/"
(@config['gitlab_url'] ||= "http://localhost").sub(%r{/*$}, '')
end
def http_settings
......
......@@ -35,6 +35,12 @@ eos
it { should_not be_empty }
it { should eq(url) }
context 'remove trailing slashes' do
before { config.send(:config)['gitlab_url'] = url + '//' }
it { should eq(url) }
end
end
describe :audit_usernames do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment