diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue index a677529cc19d1e59deaff7243d112d3733ab3d59..f987c3728627443592b5a36e421d8182a8aa6aaf 100644 --- a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue +++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue @@ -455,6 +455,20 @@ export default { <gl-loading-icon v-if="$apollo.loading" size="lg" /> <div v-else-if="!branchRule && !isPredefinedRule">{{ $options.i18n.noData }}</div> <div v-else> + <access-levels-drawer + :is-open="isAllowedToMergeDrawerOpen || isAllowedToPushAndMergeDrawerOpen" + :roles="accessLevelsDrawerData.roles" + :users="accessLevelsDrawerData.users" + :groups="accessLevelsDrawerData.groups" + :deploy-keys="accessLevelsDrawerData.deployKeys" + :is-loading="isRuleUpdating" + :group-id="groupId" + :title="accessLevelsDrawerTitle" + :is-push-access-levels="isAllowedToPushAndMergeDrawerOpen" + @editRule="onEditAccessLevels" + @close="closeAccessLevelsDrawer" + /> + <crud-component :title="$options.i18n.ruleTarget" data-testid="rule-target-card"> <template #actions> <gl-button @@ -523,20 +537,6 @@ export default { @edit="openAllowedToPushAndMergeDrawer" /> - <access-levels-drawer - :is-open="isAllowedToMergeDrawerOpen || isAllowedToPushAndMergeDrawerOpen" - :roles="accessLevelsDrawerData.roles" - :users="accessLevelsDrawerData.users" - :groups="accessLevelsDrawerData.groups" - :deploy-keys="accessLevelsDrawerData.deployKeys" - :is-loading="isRuleUpdating" - :group-id="groupId" - :title="accessLevelsDrawerTitle" - :is-push-access-levels="isAllowedToPushAndMergeDrawerOpen" - @editRule="onEditAccessLevels" - @close="closeAccessLevelsDrawer" - /> - <!-- Force push --> <protection-toggle v-if="hasPushAccessLevelSet"