Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index 418c465d820..0d588746362 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -121,7 +121,7 @@ export default {
         @error="error = $event"
         @updated="$emit('workItemUpdated')"
       />
-      <work-item-links :work-item-id="workItem.id" />
+      <work-item-links v-if="glFeatures.workItemsHierarchy" :work-item-id="workItem.id" />
     </template>
   </section>
 </template>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
index 6124e669cb3..df3326083af 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links.vue
@@ -30,6 +30,11 @@ export default {
     toggleIcon() {
       return this.isOpen ? 'angle-up' : 'angle-down';
     },
+    toggleLabel() {
+      return this.isOpen
+        ? s__('WorkItem|Collapse child items')
+        : s__('WorkItem|Expand child items');
+    },
   },
   methods: {
     toggle() {
@@ -60,6 +65,7 @@ export default {
         <gl-button
           category="tertiary"
           :icon="toggleIcon"
+          :aria-label="toggleLabel"
           data-testid="toggle-links"
           @click="toggle"
         />