diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 09:01:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 09:01:22 +0000 |
| commit | 781efd183a476986b45f5a9bc407c037f9f14f5f (patch) | |
| tree | 76e2c630f72c362327127083ca07c06408efc738 | |
| parent | 5921c7481302913bffe88788c354f415cd19df82 (diff) | |
| parent | 74bcc8321e5c9eb2f84306d1688ead35f3c86579 (diff) | |
| download | gitlab-ce-781efd183a476986b45f5a9bc407c037f9f14f5f.tar.gz | |
Merge branch 'broadcast-3-digit-colors' into 'master'
Broadcast 3 digit colors
| -rw-r--r-- | app/models/broadcast_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index 85ab7ed6ae8..ce8b7973cd9 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -20,8 +20,8 @@ class BroadcastMessage < ActiveRecord::Base validates :starts_at, presence: true validates :ends_at, presence: true - validates :color, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true - validates :font, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: 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 def self.current where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last |