diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
| commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
| tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/models/incident_management/timeline_event.rb | |
| parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/models/incident_management/timeline_event.rb')
| -rw-r--r-- | app/models/incident_management/timeline_event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/incident_management/timeline_event.rb b/app/models/incident_management/timeline_event.rb index d30d6906e14..dd0d3c6585d 100644 --- a/app/models/incident_management/timeline_event.rb +++ b/app/models/incident_management/timeline_event.rb @@ -20,6 +20,6 @@ module IncidentManagement validates :action, presence: true, length: { maximum: 128 } validates :note, :note_html, presence: true, length: { maximum: 10_000 } - scope :order_occurred_at_asc, -> { reorder(occurred_at: :asc) } + scope :order_occurred_at_asc_id_asc, -> { reorder(occurred_at: :asc, id: :asc) } end end |