Commit 797995b9 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '329110-epic-move-confidentiality-above-ancestors-in-sidebar' into 'master'

Switched ancestors and confidentiality in epic sidebar

See merge request gitlab-org/gitlab!60328
parents 6bd6581a 94939744
......@@ -222,9 +222,6 @@ export default {
:sidebar-collapsed="sidebarCollapsed"
data-testid="labels-select"
/>
<div v-if="allowSubEpics" class="block ancestors">
<ancestors-tree :ancestors="ancestors" :is-fetching="false" data-testid="ancestors" />
</div>
<sidebar-confidentiality-widget
:iid="String(iid)"
:full-path="fullPath"
......@@ -233,6 +230,9 @@ export default {
@expandSidebar="handleSidebarToggle"
@confidentialityUpdated="updateConfidentialityOnIssuable($event)"
/>
<div v-if="allowSubEpics" class="block ancestors">
<ancestors-tree :ancestors="ancestors" :is-fetching="false" data-testid="ancestors" />
</div>
<div class="block participants">
<sidebar-participants
:participants="participants"
......
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