diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index 56ea886442c..4264c369266 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -2694,6 +2694,7 @@ Gitlab/BoundedContexts: - 'ee/app/models/concerns/epics/metadata_cache_update.rb' - 'ee/app/models/concerns/filterable_by_test_reports.rb' - 'ee/app/models/concerns/health_status.rb' + - 'ee/app/models/concerns/singleton_record.rb' - 'ee/app/models/concerns/identity_verifiable.rb' - 'ee/app/models/concerns/incident_management/base_pending_escalation.rb' - 'ee/app/models/concerns/insights_feature.rb' diff --git a/Gemfile.checksum b/Gemfile.checksum index a83d73edd1e..1f76d4e6582 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -365,7 +365,7 @@ {"name":"kubeclient","version":"4.11.0","platform":"ruby","checksum":"4985fcd749fb8c364a668a8350a49821647f03aa52d9ee6cbc582beb8e883fcc"}, {"name":"language_server-protocol","version":"3.17.0.3","platform":"ruby","checksum":"3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f"}, {"name":"launchy","version":"2.5.2","platform":"ruby","checksum":"8aa0441655aec5514008e1d04892c2de3ba57bd337afb984568da091121a241b"}, -{"name":"lefthook","version":"1.11.5","platform":"ruby","checksum":"309fe0b9c8586af81775e88f111572003192d2a1598bf2800f0d4d1f8ba9a826"}, +{"name":"lefthook","version":"1.11.12","platform":"ruby","checksum":"7bcc883edeb03b01b109f802ed85c33f539b5d21fa64a838625f1ff2ff04edcf"}, {"name":"letter_opener","version":"1.10.0","platform":"ruby","checksum":"2ff33f2e3b5c3c26d1959be54b395c086ca6d44826e8bf41a14ff96fdf1bdbb2"}, {"name":"letter_opener_web","version":"3.0.0","platform":"ruby","checksum":"3f391efe0e8b9b24becfab5537dfb17a5cf5eb532038f947daab58cb4b749860"}, {"name":"libyajl2","version":"2.1.0","platform":"ruby","checksum":"aa5df6c725776fc050c8418450de0f7c129cb7200b811907c4c0b3b5c0aea0ef"}, diff --git a/Gemfile.lock b/Gemfile.lock index 340f4b961fa..11393cda5c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1114,7 +1114,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lefthook (1.11.5) + lefthook (1.11.12) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index a83d73edd1e..1f76d4e6582 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -365,7 +365,7 @@ {"name":"kubeclient","version":"4.11.0","platform":"ruby","checksum":"4985fcd749fb8c364a668a8350a49821647f03aa52d9ee6cbc582beb8e883fcc"}, {"name":"language_server-protocol","version":"3.17.0.3","platform":"ruby","checksum":"3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f"}, {"name":"launchy","version":"2.5.2","platform":"ruby","checksum":"8aa0441655aec5514008e1d04892c2de3ba57bd337afb984568da091121a241b"}, -{"name":"lefthook","version":"1.11.5","platform":"ruby","checksum":"309fe0b9c8586af81775e88f111572003192d2a1598bf2800f0d4d1f8ba9a826"}, +{"name":"lefthook","version":"1.11.12","platform":"ruby","checksum":"7bcc883edeb03b01b109f802ed85c33f539b5d21fa64a838625f1ff2ff04edcf"}, {"name":"letter_opener","version":"1.10.0","platform":"ruby","checksum":"2ff33f2e3b5c3c26d1959be54b395c086ca6d44826e8bf41a14ff96fdf1bdbb2"}, {"name":"letter_opener_web","version":"3.0.0","platform":"ruby","checksum":"3f391efe0e8b9b24becfab5537dfb17a5cf5eb532038f947daab58cb4b749860"}, {"name":"libyajl2","version":"2.1.0","platform":"ruby","checksum":"aa5df6c725776fc050c8418450de0f7c129cb7200b811907c4c0b3b5c0aea0ef"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 340f4b961fa..11393cda5c2 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1114,7 +1114,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lefthook (1.11.5) + lefthook (1.11.12) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 75ae4684979..5d42aa706da 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -38,6 +38,8 @@ export default { import('ee_component/related_items_tree/components/issue_health_status.vue'), EpicCountables: () => import('ee_else_ce/vue_shared/components/epic_countables/epic_countables.vue'), + WorkItemStatusBadge: () => + import('ee_component/work_items/components/shared/work_item_status_badge.vue'), }, directives: { GlTooltip: GlTooltipDirective, @@ -202,6 +204,12 @@ export default { targetId() { return uniqueId(`${this.item.iid}`); }, + showStatus() { + return this.hasStatus && this.glFeatures.workItemStatusFeatureFlag; + }, + hasStatus() { + return Boolean(this.item.status); + }, }, methods: { setError, @@ -305,7 +313,9 @@ export default { /> -