From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Jul 2020 12:26:25 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee

---
 .../pages/groups/group_members/index.js            | 30 ++++++++++++++++++++++
 .../pages/groups/group_members/index/index.js      | 14 ----------
 2 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/javascripts/pages/groups/group_members/index.js
 delete mode 100644 app/assets/javascripts/pages/groups/group_members/index/index.js

(limited to 'app/assets/javascripts/pages/groups/group_members')

diff --git a/app/assets/javascripts/pages/groups/group_members/index.js b/app/assets/javascripts/pages/groups/group_members/index.js
new file mode 100644
index 00000000000..e146592e134
--- /dev/null
+++ b/app/assets/javascripts/pages/groups/group_members/index.js
@@ -0,0 +1,30 @@
+import Vue from 'vue';
+import Members from 'ee_else_ce/members';
+import memberExpirationDate from '~/member_expiration_date';
+import UsersSelect from '~/users_select';
+import groupsSelect from '~/groups_select';
+import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue';
+
+function mountRemoveMemberModal() {
+  const el = document.querySelector('.js-remove-member-modal');
+  if (!el) {
+    return false;
+  }
+
+  return new Vue({
+    el,
+    render(createComponent) {
+      return createComponent(RemoveMemberModal);
+    },
+  });
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+  groupsSelect();
+  memberExpirationDate();
+  memberExpirationDate('.js-access-expiration-date-groups');
+  mountRemoveMemberModal();
+
+  new Members(); // eslint-disable-line no-new
+  new UsersSelect(); // eslint-disable-line no-new
+});
diff --git a/app/assets/javascripts/pages/groups/group_members/index/index.js b/app/assets/javascripts/pages/groups/group_members/index/index.js
deleted file mode 100644
index 0c732922e81..00000000000
--- a/app/assets/javascripts/pages/groups/group_members/index/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint-disable no-new */
-
-import Members from 'ee_else_ce/members';
-import memberExpirationDate from '~/member_expiration_date';
-import UsersSelect from '~/users_select';
-import groupsSelect from '~/groups_select';
-
-document.addEventListener('DOMContentLoaded', () => {
-  memberExpirationDate();
-  memberExpirationDate('.js-access-expiration-date-groups');
-  new Members();
-  groupsSelect();
-  new UsersSelect();
-});
-- 
cgit v1.2.1