diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/models/incident_management/timeline_event.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/models/incident_management/timeline_event.rb')
-rw-r--r-- | app/models/incident_management/timeline_event.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/incident_management/timeline_event.rb b/app/models/incident_management/timeline_event.rb index dd0d3c6585d..735d4e4298c 100644 --- a/app/models/incident_management/timeline_event.rb +++ b/app/models/incident_management/timeline_event.rb @@ -18,7 +18,13 @@ module IncidentManagement validates :project, :incident, :occurred_at, presence: true validates :action, presence: true, length: { maximum: 128 } - validates :note, :note_html, presence: true, length: { maximum: 10_000 } + validates :note, presence: true, length: { maximum: 10_000 } + validates :note_html, length: { maximum: 10_000 } + + has_many :timeline_event_tag_links, class_name: 'IncidentManagement::TimelineEventTagLink' + has_many :timeline_event_tags, + class_name: 'IncidentManagement::TimelineEventTag', + through: :timeline_event_tag_links scope :order_occurred_at_asc_id_asc, -> { reorder(occurred_at: :asc, id: :asc) } end |