Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 28 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 a80a2dc5737..49813edf6fc 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
@@ -43,13 +43,9 @@ export default {
       type: Boolean,
       required: true,
     },
-    childPath: {
-      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. 
+      Status icon is shown on the task while the actual task icon is shown on any Objective/Key result.
     */
     showTaskIcon: {
       type: Boolean,
@@ -157,9 +153,8 @@ export default {
             />
           </span>
           <gl-link
-            :href="childPath"
+            :href="childItem.webUrl"
             class="gl-overflow-break-word gl-font-weight-semibold"
-            data-testid="item-title"
             @click="$emit('click', $event)"
             @mouseover="$emit('mouseover')"
             @mouseout="$emit('mouseout')"
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
index 679287338c8..847a3585ac4 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue
@@ -13,7 +13,6 @@ import {
   WIDGET_TYPE_HIERARCHY,
   WORK_ITEM_NAME_TO_ICON_MAP,
 } from '../../constants';
-import { workItemPath } from '../../utils';
 import getWorkItemTreeQuery from '../../graphql/work_item_tree.query.graphql';
 import WorkItemLinkChildContents from '../shared/work_item_link_child_contents.vue';
 import WorkItemTreeChildren from './work_item_tree_children.vue';
@@ -27,7 +26,6 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  inject: ['fullPath'],
   props: {
     canUpdate: {
       type: Boolean,
@@ -90,9 +88,6 @@ export default {
     stateTimestampTypeText() {
       return this.isItemOpen ? __('Created') : __('Closed');
     },
-    childPath() {
-      return workItemPath(this.fullPath, this.childItem.iid);
-    },
     chevronType() {
       return this.isExpanded ? 'chevron-down' : 'chevron-right';
     },
@@ -236,7 +231,6 @@ export default {
         :can-update="canUpdate"
         :parent-work-item-id="issuableGid"
         :work-item-type="workItemType"
-        :child-path="childPath"
         @click="$emit('click', $event)"
         @removeChild="$emit('removeChild', childItem)"
       />
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 094661b1aa8..002c1786044 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
@@ -1,6 +1,5 @@
 <script>
 import WorkItemLinkChildContents from '../shared/work_item_link_child_contents.vue';
-import { workItemPath } from '../../utils';
 
 export default {
   components: {
@@ -20,15 +19,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    workItemFullPath: {
-      type: String,
-      required: true,
-    },
-  },
-  methods: {
-    linkedItemPath(fullPath, id) {
-      return workItemPath(fullPath, id);
-    },
   },
 };
 </script>
@@ -51,7 +41,6 @@ export default {
           <work-item-link-child-contents
             :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)"
diff --git a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
index 8d8aa22e544..20427fe96c4 100644
--- a/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
+++ b/app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationships.vue
@@ -263,7 +263,6 @@ export default {
               }"
               :linked-items="linksBlocks"
               :heading="$options.i18n.blockingTitle"
-              :work-item-full-path="workItemFullPath"
               :can-update="canAdminWorkItemLink"
               @showModal="$emit('showModal', { event: $event.event, modalWorkItem: $event.child })"
               @removeLinkedItem="removeLinkedItem"
@@ -276,7 +275,6 @@ export default {
               }"
               :linked-items="linksIsBlockedBy"
               :heading="$options.i18n.blockedByTitle"
-              :work-item-full-path="workItemFullPath"
               :can-update="canAdminWorkItemLink"
               @showModal="$emit('showModal', { event: $event.event, modalWorkItem: $event.child })"
               @removeLinkedItem="removeLinkedItem"
@@ -285,7 +283,6 @@ export default {
               v-if="linksRelatesTo.length"
               :linked-items="linksRelatesTo"
               :heading="$options.i18n.relatedToTitle"
-              :work-item-full-path="workItemFullPath"
               :can-update="canAdminWorkItemLink"
               @showModal="$emit('showModal', { event: $event.event, modalWorkItem: $event.child })"
               @removeLinkedItem="removeLinkedItem"