Commit ef571354 authored by James Lopez's avatar James Lopez
Browse files

few more changes from suggestions

parent 67f59ebd
......@@ -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)
......
......@@ -18,7 +18,6 @@
# end
#
class AddressableUrlValidator < ActiveModel::EachValidator
DEFAULT_OPTIONS = { protocols: %w(http https ssh git) }
def validate_each(record, attribute, value)
......
......@@ -53,7 +53,10 @@ def valid_protocol?(value)
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.')
......
module Gitlab
class UrlSanitizer
def self.sanitize(content)
regexp = URI::Parser.new.make_regexp(['http', 'https', 'ssh', 'git'])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment