Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/app/assets/javascripts/groups/members/components/app.vue b/app/assets/javascripts/groups/members/components/app.vue
index e94b28f5773..32b832644b9 100644
--- a/app/assets/javascripts/groups/members/components/app.vue
+++ b/app/assets/javascripts/groups/members/components/app.vue
@@ -1,11 +1,12 @@
 <script>
+import MembersTable from '~/vue_shared/components/members/table/members_table.vue';
+
 export default {
   name: 'GroupMembersApp',
+  components: { MembersTable },
 };
 </script>
 
 <template>
-  <span>
-    <!-- Temporary empty template -->
-  </span>
+  <members-table />
 </template>
diff --git a/app/assets/javascripts/groups/members/index.js b/app/assets/javascripts/groups/members/index.js
index 4ca1756f10c..0a032eacf05 100644
--- a/app/assets/javascripts/groups/members/index.js
+++ b/app/assets/javascripts/groups/members/index.js
@@ -4,7 +4,7 @@ import App from './components/app.vue';
 import membersModule from '~/vuex_shared/modules/members';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
-export default el => {
+export const initGroupMembersApp = (el, tableFields) => {
   if (!el) {
     return () => {};
   }
@@ -18,6 +18,7 @@ export default el => {
       members: convertObjectPropsToCamelCase(JSON.parse(members), { deep: true }),
       sourceId: parseInt(groupId, 10),
       currentUserId: gon.current_user_id || null,
+      tableFields,
     }),
   });