Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 2 deletions

diff --git a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
index f50cfac90f7..24cd0c2296b 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
@@ -47,6 +47,15 @@ export default {
       type: String,
       required: true,
     },
+    /* 
+      This flag is added to manage between two different work items; Task and Objective/Key result.
+      Status icon is shown on the task while the actual task icon is shown on any Objective/Key result. 
+    */
+    showTaskIcon: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     labels() {
@@ -69,7 +78,7 @@ export default {
       return this.childItem.state === STATE_OPEN;
     },
     iconName() {
-      if (this.childItemType === TASK_TYPE_NAME) {
+      if (this.childItemType === TASK_TYPE_NAME && !this.showTaskIcon) {
         return this.isChildItemOpen ? 'issue-open-m' : 'issue-close';
       }
       return WORK_ITEM_NAME_TO_ICON_MAP[this.childItemType];
@@ -78,7 +87,7 @@ export default {
       return this.childItem.workItemType.name;
     },
     iconClass() {
-      if (this.childItemType === TASK_TYPE_NAME) {
+      if (this.childItemType === TASK_TYPE_NAME && !this.showTaskIcon) {
         return this.isChildItemOpen ? 'gl-text-green-500' : 'gl-text-blue-500';
       }
       return '';
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
index cd6064d4dd0..094661b1aa8 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue
@@ -52,6 +52,7 @@ export default {
             :child-item="linkedItem.workItem"
             :can-update="canUpdate"
             :child-path="linkedItemPath(workItemFullPath, linkedItem.workItem.iid)"
+            :show-task-icon="true"
             @click="$emit('showModal', { event: $event, child: linkedItem.workItem })"
             @removeChild="$emit('removeLinkedItem', linkedItem.workItem)"
           />