diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-12-01 18:53:44 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-07 16:57:26 -0500 |
commit | e48391b813d3e5079238aa3f0662e7a46e1b4a54 (patch) | |
tree | bc7abec1eb4b27a16dcf47d09483b967bffdd3a8 /app/models/broadcast_message.rb | |
parent | b3200c8c44f2351d88d5d78d7ded3ac06001bd7c (diff) | |
download | gitlab-ce-e48391b813d3e5079238aa3f0662e7a46e1b4a54.tar.gz |
Add custom ColorValidator
Diffstat (limited to 'app/models/broadcast_message.rb')
-rw-r--r-- | app/models/broadcast_message.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index 05f5e979695..ad514706160 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -16,12 +16,12 @@ class BroadcastMessage < ActiveRecord::Base include Sortable - validates :message, presence: true + validates :message, presence: true validates :starts_at, presence: true - validates :ends_at, presence: true + validates :ends_at, presence: true - validates :color, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true - validates :font, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true + validates :color, allow_blank: true, color: true + validates :font, allow_blank: true, color: true def self.current where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last |