diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-04-11 06:29:07 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-04-11 06:29:07 +0000 |
| commit | d119d3d1b25aac661e6251addf87b280bd37f0c5 (patch) | |
| tree | aeaf0d9503326ec7f51968e8d1de48d83ce90503 /app/models/releases | |
| parent | 79bf4bdaad438dc0f82771b102f3c07225a428da (diff) | |
| download | gitlab-ce-d119d3d1b25aac661e6251addf87b280bd37f0c5.tar.gz | |
Align UrlValidator to validate_url gem implementation.
Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement.
Make use of the options attribute of the parent class ActiveModel::EachValidator.
Add more options: allow_nil, allow_blank, message.
Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
Diffstat (limited to 'app/models/releases')
| -rw-r--r-- | app/models/releases/link.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/releases/link.rb b/app/models/releases/link.rb index 36ec33d3e3e..58c2b98e524 100644 --- a/app/models/releases/link.rb +++ b/app/models/releases/link.rb @@ -6,7 +6,7 @@ module Releases belongs_to :release - validates :url, presence: true, url: { protocols: %w(http https ftp) }, uniqueness: { scope: :release } + validates :url, presence: true, addressable_url: { schemes: %w(http https ftp) }, uniqueness: { scope: :release } validates :name, presence: true, uniqueness: { scope: :release } scope :sorted, -> { order(created_at: :desc) } |