Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 7 deletions

diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb
index ba36b332e5a..938ca3ca317 100644
--- a/lib/gitlab/url_blocker.rb
+++ b/lib/gitlab/url_blocker.rb
@@ -12,7 +12,6 @@ module Gitlab
     class << self
       # Validates the given url according to the constraints specified by arguments.
       #
-      # schemes - Array of URI schemes or `:none` if scheme must not be set.
       # ports - Raises error if the given URL port is not between given ports.
       # allow_localhost - Raises error if URL resolves to a localhost IP address and argument is false.
       # allow_local_network - Raises error if URL resolves to a link-local address and argument is false.
@@ -230,12 +229,6 @@ module Gitlab
       end
 
       def validate_scheme(scheme, schemes)
-        if schemes == :none
-          return if scheme.nil?
-
-          raise BlockedUrlError, "No scheme allowed but got `#{scheme}://`"
-        end
-
         if scheme.blank? || (schemes.any? && schemes.exclude?(scheme))
           raise BlockedUrlError, "Only allowed schemes are #{schemes.join(', ')}"
         end