diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 09:07:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 09:07:23 +0300 |
| commit | 5a38951c4dd8d81749ae491c8e3355b01f067168 (patch) | |
| tree | 8a9fa41ee56aea74c4a5264283ca16b178417dce /app/assets/javascripts/members | |
| parent | 0cee6f1577cd31cae7dc0e82f65dcad462a4d18a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/members')
3 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue index 8f5c32956a2..82f5c5457ec 100644 --- a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue +++ b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue @@ -20,7 +20,7 @@ export default { 'ee_component/members/components/action_dropdowns/disable_two_factor_dropdown_item.vue' ), LdapOverrideDropdownItem: () => - import('ee_component/members/components/ldap/ldap_override_dropdown_item.vue'), + import('ee_component/members/components/action_dropdowns/ldap_override_dropdown_item.vue'), LeaveGroupDropdownItem, RemoveMemberDropdownItem, }, diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 22cbca2c143..3f9fb3dec2f 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -51,7 +51,7 @@ export default { DisableTwoFactorModal: () => import('ee_component/members/components/modals/disable_two_factor_modal.vue'), LdapOverrideConfirmationModal: () => - import('ee_component/members/components/ldap/ldap_override_confirmation_modal.vue'), + import('ee_component/members/components/modals/ldap_override_confirmation_modal.vue'), }, inject: ['namespace', 'currentUserId', 'canManageMembers'], props: { diff --git a/app/assets/javascripts/members/components/table/role_dropdown.vue b/app/assets/javascripts/members/components/table/role_dropdown.vue index 70808587d56..e066b023fbb 100644 --- a/app/assets/javascripts/members/components/table/role_dropdown.vue +++ b/app/assets/javascripts/members/components/table/role_dropdown.vue @@ -11,7 +11,8 @@ export default { components: { GlDropdown, GlDropdownItem, - LdapDropdownItem: () => import('ee_component/members/components/ldap/ldap_dropdown_item.vue'), + LdapDropdownItem: () => + import('ee_component/members/components/action_dropdowns/ldap_dropdown_item.vue'), }, inject: ['namespace', 'group'], props: { |