Skip to content

Commit 4833666

Browse files
committed
Merge remote-tracking branch 'nud/suivi-2047-url-validation-inconsistency' into fix-uri-fragement-validation
2 parents ab69ea5 + 25aa7d1 commit 4833666

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/models/user.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class User < ActiveRecord::Base
3030
has_many :taggings, -> { includes(:tag) }, dependent: :destroy
3131
has_many :tags, -> { distinct }, through: :taggings
3232

33-
validates_format_of :homesite, message: "L’adresse du site Web personnel n’est pas valide", with: URI::regexp(%w(http https)), allow_blank: true
34-
validates :homesite, length: { maximum: 100, message: "L’adresse du site Web personnel est trop longue" }
33+
validates :homesite, http_url: { protocols: ["http", "https"], message: "L’adresse du site Web personnel n’est pas valide" },
34+
length: { maximum: 100, message: "L’adresse du site Web personnel est trop longue" }
3535
validates :name, length: { maximum: 40, message: "Le nom affiché est trop long" }
3636
validates :jabber_id, length: { maximum: 32, message: "L’adresse XMPP est trop longue" }
3737
validates :mastodon_url, http_url: { protocols: ["https"], message: "L’adresse du compte Mastodon n’est pas valide" },

0 commit comments

Comments
 (0)