Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/app/models/incident_management/timeline_event_tag.rb b/app/models/incident_management/timeline_event_tag.rb
index cde3afcaa16..ad1ec04e1e7 100644
--- a/app/models/incident_management/timeline_event_tag.rb
+++ b/app/models/incident_management/timeline_event_tag.rb
@@ -4,6 +4,9 @@ module IncidentManagement
   class TimelineEventTag < ApplicationRecord
     self.table_name = 'incident_management_timeline_event_tags'
 
+    START_TIME_TAG_NAME = 'Start time'
+    END_TIME_TAG_NAME = 'End time'
+
     belongs_to :project, inverse_of: :incident_management_timeline_event_tags
 
     has_many :timeline_event_tag_links,
@@ -16,5 +19,9 @@ module IncidentManagement
     validates :name, presence: true, format: { with: /\A[^,]+\z/ }
     validates :name, uniqueness: { scope: :project_id }
     validates :name, length: { maximum: 255 }
+
+    def self.pluck_names
+      pluck(:name)
+    end
   end
 end