diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-29 17:29:54 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-29 17:29:54 +0000 |
commit | fd2993b5349007441bc1cf4734e05696b3797e22 (patch) | |
tree | f5c946f50313ccb5ebd819b727b0cef9a13ed449 | |
parent | d0b60be33c4487ef561001fc6aed7778954dafa1 (diff) | |
parent | 59b8165c9091751ebbae271655fd0eaf3c97ab20 (diff) | |
download | gitlab-ce-fd2993b5349007441bc1cf4734e05696b3797e22.tar.gz |
Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'
Strip trailing whitespaces in submodule URLs
Closes #33018
See merge request !11753
-rw-r--r-- | app/helpers/submodule_helper.rb | 1 | ||||
-rw-r--r-- | changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml | 4 | ||||
-rw-r--r-- | spec/helpers/submodule_helper_spec.rb | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 09b73eee8cf..c0763a8a9c4 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -13,6 +13,7 @@ module SubmoduleHelper if url =~ /([^\/:]+)\/([^\/]+(?:\.git)?)\Z/ namespace, project = $1, $2 + project.rstrip! project.sub!(/\.git\z/, '') if self_url?(url, namespace, project) diff --git a/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml b/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml new file mode 100644 index 00000000000..d633995d467 --- /dev/null +++ b/changelogs/unreleased/sh-fix-submodules-trailing-spaces.yml @@ -0,0 +1,4 @@ +--- +title: Strip trailing whitespaces in submodule URLs +merge_request: +author: diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb index 18935be95c9..b05ae5c2232 100644 --- a/spec/helpers/submodule_helper_spec.rb +++ b/spec/helpers/submodule_helper_spec.rb @@ -115,6 +115,11 @@ describe SubmoduleHelper do expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash']) end + it 'handles urls with trailing whitespace' do + stub_url('http://gitlab.com/gitlab-org/gitlab-ce.git ') + expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash']) + end + it 'returns original with non-standard url' do stub_url('http://gitlab.com/another/gitlab-org/gitlab-ce.git') expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil]) |