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/finders/incident_management/timeline_events_finder.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/finders/incident_management/timeline_events_finder.rb')
-rw-r--r-- | app/finders/incident_management/timeline_events_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/incident_management/timeline_events_finder.rb b/app/finders/incident_management/timeline_events_finder.rb index 09de46bb79f..aaf3133236a 100644 --- a/app/finders/incident_management/timeline_events_finder.rb +++ b/app/finders/incident_management/timeline_events_finder.rb @@ -31,7 +31,7 @@ module IncidentManagement end def sort(collection) - collection.order_occurred_at_asc + collection.order_occurred_at_asc_id_asc end end end |