Commit b3fcb82d authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'weimeng-fix-subgroup-epics' into 'master'

Fix epics from sub-groups errors on reorder, delete

See merge request gitlab-org/gitlab-ee!11837
parents 9f4d496c b2ac92f3
......@@ -14,6 +14,6 @@ class LinkedEpicEntity < Grape::Entity
end
expose :relation_path do |epic|
group_epic_link_path(epic.group, request.issuable.iid, epic.id)
group_epic_link_path(request.issuable.group, request.issuable.iid, epic.id)
end
end
---
title: Fix error when reordering/deleting subgroup epics
merge_request: 11837
author:
type: fixed
......@@ -18,7 +18,7 @@ describe EpicLinks::ListService, :postgresql do
state: epic.state,
reference: epic.to_reference(group),
path: "/groups/#{epic.group.full_path}/-/epics/#{epic.iid}",
relation_path: "/groups/#{epic.group.full_path}/-/epics/#{parent_epic.iid}/links/#{epic.id}"
relation_path: "/groups/#{parent_epic.group.full_path}/-/epics/#{parent_epic.iid}/links/#{epic.id}"
}
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment