summaryrefslogtreecommitdiff
path: root/spec/gitlab_config_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-14 11:38:08 +0000
committerDouwe Maan <douwe@gitlab.com>2015-12-14 11:38:08 +0000
commit962f7a312623e8ab34efeaf098701c89e633b68c (patch)
treeb743290e5120b9e6923d084768995cad8f6ef306 /spec/gitlab_config_spec.rb
parent785484d2ae5af1254fbb3baa2775acc930e85d88 (diff)
parent7fb2d88454e703d1a4d51e87a9276b3e0ef4809d (diff)
downloadgitlab-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 'spec/gitlab_config_spec.rb')
-rw-r--r--spec/gitlab_config_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/gitlab_config_spec.rb b/spec/gitlab_config_spec.rb
index 52fb182..0ce641b 100644
--- a/spec/gitlab_config_spec.rb
+++ b/spec/gitlab_config_spec.rb
@@ -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