kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Strip trailing whitespace in relative submodule URL

Browse source
This commit is contained in:
Douwe Maan 2017-06-28 14:01:39 -05:00
parent 585e6aa5b2
commit 78379f66dd
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/helpers/submodule_helper.rb
View file

@ -73,6 +73,7 @@ module SubmoduleHelper
end end
def relative_self_links(url, commit) def relative_self_links(url, commit)
url.rstrip!
# Map relative links to a namespace and project # Map relative links to a namespace and project
# For example: # For example:
# ../bar.git -> same namespace, repo bar # ../bar.git -> same namespace, repo bar

4
changelogs/unreleased/dm-relative-submodule-url-trailing-whitespace.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Strip trailing whitespace in relative submodule URL
merge_request:
author:

5
spec/helpers/submodule_helper_spec.rb
View file

@ -170,6 +170,11 @@ describe SubmoduleHelper do
expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"]) expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"])
end end
it 'with trailing whitespace' do
result = relative_self_links('../test.git ', commit_id)
expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"])
end
it 'two levels down' do it 'two levels down' do
result = relative_self_links('../../test.git', commit_id) result = relative_self_links('../../test.git', commit_id)
expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"]) expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"])