diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/label.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index 1f22ed23d42..eee28acefc1 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -27,7 +27,7 @@ class Label < ActiveRecord::Base # Don't allow '?', '&', and ',' for label titles validates :title, presence: true, - format: { with: /\A[^&\?,&]+\z/ }, + format: { with: /\A[^&\?,]+\z/ }, uniqueness: { scope: :project_id } default_scope { order(title: :asc) } diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index d264a56ebdf..07520eab5d1 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -50,8 +50,9 @@ class HipchatService < Service def execute(data) return unless supported_events.include?(data[:object_kind]) - - gate[room].send('GitLab', create_message(data)) + message = create_message(data) + return unless message.present? + gate[room].send('GitLab', message) end private |