diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 15:08:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 15:08:21 +0000 |
| commit | 8099b2824b5c3316af68fd8a5b9247c676a6d38b (patch) | |
| tree | 8dafc7d7cd75d1020ae30cc905e9852bc3bb9804 /app/validators | |
| parent | f7b08f4264cfe86b35051778699dafc55efdbf5d (diff) | |
| download | gitlab-ce-8099b2824b5c3316af68fd8a5b9247c676a6d38b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/addressable_url_validator.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/validators/addressable_url_validator.rb b/app/validators/addressable_url_validator.rb index 2c41b4a9d2e..3e6ec0b6f29 100644 --- a/app/validators/addressable_url_validator.rb +++ b/app/validators/addressable_url_validator.rb @@ -17,8 +17,6 @@ # validates :ftp_url, addressable_url: { schemes: %w(ftp) } # # validates :git_url, addressable_url: { schemes: %w(http https ssh git) } -# -# validates :smtp_adderss, addressable_url: { schemes: :none } # end # # This validator can also block urls pointing to localhost or the local network to @@ -27,7 +25,7 @@ # Configuration options: # * <tt>message</tt> - A custom error message, used when the URL is blank. (default is: "must be a valid URL"). # * <tt>blocked_message</tt> - A custom error message, used when the URL is blocked. Default: +'is blocked: %{exception_message}'+. -# * <tt>schemes</tt> - Array of URI schemes or `:none`. Default: +['http', 'https']+ +# * <tt>schemes</tt> - Array of URI schemes. Default: +['http', 'https']+ # * <tt>allow_localhost</tt> - Allow urls pointing to +localhost+. Default: +true+ # * <tt>allow_local_network</tt> - Allow urls pointing to private network addresses. Default: +true+ # * <tt>allow_blank</tt> - Allow urls to be +blank+. Default: +false+ |