summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/label.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 31f68c31e5c..ea1daa6a204 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -2,9 +2,11 @@ class Label < ActiveRecord::Base
belongs_to :project
has_many :label_links, dependent: :destroy
- validates :color, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true
+ validates :color, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true
validates :project, presence: true
- validates :title, presence: true
+
+ # Dont allow '?', '&', and ',' for label titles
+ validates :title, presence: true, format: { with: /\A[^&\?,&]*\z/ }
def name
title