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
iv
gitlab-ce
Commits
ef571354
Commit
ef571354
authored
Jun 30, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few more changes from suggestions
parent
67f59ebd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
CHANGELOG
CHANGELOG
+0
-2
app/validators/addressable_url_validator.rb
app/validators/addressable_url_validator.rb
+0
-1
db/migrate/20160620110927_fix_no_validatable_import_url.rb
db/migrate/20160620110927_fix_no_validatable_import_url.rb
+4
-1
lib/gitlab/url_sanitizer.rb
lib/gitlab/url_sanitizer.rb
+0
-1
No files found.
CHANGELOG
View file @
ef571354
...
...
@@ -25,8 +25,6 @@ v 8.10.0 (unreleased)
- Add Bugzilla integration !4930 (iamtjg)
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
- Set import_url validation to be more strict
v 8.9.3 (unreleased)
- Add basic system information like memory and disk usage to the admin panel
v 8.9.4 (unreleased)
...
...
app/validators/addressable_url_validator.rb
View file @
ef571354
...
...
@@ -18,7 +18,6 @@
# end
#
class
AddressableUrlValidator
<
ActiveModel
::
EachValidator
DEFAULT_OPTIONS
=
{
protocols:
%w(http https ssh git)
}
def
validate_each
(
record
,
attribute
,
value
)
...
...
db/migrate/20160620110927_fix_no_validatable_import_url.rb
View file @
ef571354
...
...
@@ -53,7 +53,10 @@ class FixNoValidatableImportUrl < ActiveRecord::Migration
end
def
up
return
unless
defined?
(
Addressable
::
URI
::
InvalidURIError
)
unless
defined?
(
Addressable
::
URI
::
InvalidURIError
)
say
(
'Skipping cleaning up invalid import URLs as class from Addressable iss missing'
)
return
end
say
(
'Cleaning up invalid import URLs... This may take a few minutes if we have a large number of imported projects.'
)
...
...
lib/gitlab/url_sanitizer.rb
View file @
ef571354
module
Gitlab
class
UrlSanitizer
def
self
.
sanitize
(
content
)
regexp
=
URI
::
Parser
.
new
.
make_regexp
([
'http'
,
'https'
,
'ssh'
,
'git'
])
...
...
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