Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
f2f345e6
Commit
f2f345e6
authored
May 23, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid encoding import url and delegate good format to user
parent
8a91f3f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
17 deletions
+1
-17
lib/gitlab/import_url.rb
lib/gitlab/import_url.rb
+1
-5
spec/lib/gitlab/import_url_spec.rb
spec/lib/gitlab/import_url_spec.rb
+0
-12
No files found.
lib/gitlab/import_url.rb
View file @
f2f345e6
module
Gitlab
module
Gitlab
class
ImportUrl
class
ImportUrl
def
initialize
(
url
,
credentials:
nil
)
def
initialize
(
url
,
credentials:
nil
)
@url
=
URI
.
parse
(
encode
(
url
)
)
@url
=
URI
.
parse
(
url
)
@credentials
=
credentials
@credentials
=
credentials
end
end
...
@@ -37,9 +37,5 @@ module Gitlab
...
@@ -37,9 +37,5 @@ module Gitlab
def
valid_credentials?
def
valid_credentials?
credentials
&&
credentials
.
is_a?
(
Hash
)
&&
credentials
.
any?
credentials
&&
credentials
.
is_a?
(
Hash
)
&&
credentials
.
any?
end
end
def
encode
(
url
)
URI
.
decode
(
url
).
size
<
url
.
size
?
url
:
URI
.
encode
(
url
)
end
end
end
end
end
spec/lib/gitlab/import_url_spec.rb
View file @
f2f345e6
...
@@ -19,16 +19,4 @@ describe Gitlab::ImportUrl do
...
@@ -19,16 +19,4 @@ describe Gitlab::ImportUrl do
describe
'credentials'
do
describe
'credentials'
do
it
{
expect
(
import_url
.
credentials
).
to
eq
(
credentials
)
}
it
{
expect
(
import_url
.
credentials
).
to
eq
(
credentials
)
}
end
end
context
'URL encoding'
do
describe
'not encoded URL'
do
let
(
:url
)
{
"https://github.com/me/my project.git"
}
it
{
expect
(
import_url
.
sanitized_url
).
to
eq
(
"https://github.com/me/my%20project.git"
)
}
end
describe
'already encoded URL'
do
let
(
:url
)
{
"https://github.com/me/my%20project.git"
}
it
{
expect
(
import_url
.
sanitized_url
).
to
eq
(
"https://github.com/me/my%20project.git"
)
}
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment