diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
| commit | fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee (patch) | |
| tree | 96aad0a31543fa520626dc1c5efabff1367a0bab /app/serializers/stage_entity.rb | |
| parent | 9c71bf3e6df2dcb20ea19df21a127823bbe5e615 (diff) | |
| parent | fa216b0e86433192ba4e39a05f42217fb4685173 (diff) | |
| download | gitlab-ce-fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into alerts-dropdown-to-modal-part-2-cealerts-dropdown-to-modal-part-2-ce
Diffstat (limited to 'app/serializers/stage_entity.rb')
| -rw-r--r-- | app/serializers/stage_entity.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb index 029dd3d0684..0b0454c5282 100644 --- a/app/serializers/stage_entity.rb +++ b/app/serializers/stage_entity.rb @@ -59,14 +59,14 @@ class StageEntity < Grape::Entity end def latest_statuses - HasStatus::ORDERED_STATUSES.map do |ordered_status| + HasStatus::ORDERED_STATUSES.flat_map do |ordered_status| grouped_statuses.fetch(ordered_status, []) - end.flatten + end end def retried_statuses - HasStatus::ORDERED_STATUSES.map do |ordered_status| + HasStatus::ORDERED_STATUSES.flat_map do |ordered_status| grouped_retried_statuses.fetch(ordered_status, []) - end.flatten + end end end |