diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
| commit | 15925290eec4f5616e12ef3169794f85150e3270 (patch) | |
| tree | b1adb5784f74a05491a38b8656e179f451b79e5e /app/models/note.rb | |
| parent | 0c3f70acf4838194f517c02874b8423303c21b48 (diff) | |
| parent | 51ed5225adf4aac3ccbf715f8647258dac784abb (diff) | |
| download | gitlab-ce-ui/dashboard-new-issue.tar.gz | |
Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 239a0f77f8e..8d433c57ceb 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -44,7 +44,7 @@ class Note < ActiveRecord::Base validates :note, :project, presence: true validates :note, uniqueness: { scope: [:author, :noteable_type, :noteable_id] }, if: ->(n) { n.is_award } validates :note, inclusion: { in: Emoji.emojis_names }, if: ->(n) { n.is_award } - validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true + validates :line_code, line_code: true, allow_blank: true # Attachments are deprecated and are handled by Markdown uploader validates :attachment, file_size: { maximum: :max_attachment_size } |