Add latest changes from gitlab-org/gitlab@master

2 files changed, 58 insertions, 0 deletions

diff --git a/app/assets/javascripts/groups/members/components/app.vue b/app/assets/javascripts/groups/members/components/app.vue
new file mode 100644
index 00000000000..e8570f7246f
--- /dev/null
+++ b/app/assets/javascripts/groups/members/components/app.vue
@@ -0,0 +1,26 @@
+<script>
+export default {
+  name: 'GroupMembersApp',
+  props: {
+    groupId: {
+      type: Number,
+      required: true,
+    },
+    currentUserId: {
+      type: Number,
+      required: false,
+      default: null,
+    },
+    members: {
+      type: Array,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <span>
+    <!-- Temporary empty template -->
+  </span>
+</template>
diff --git a/app/assets/javascripts/groups/members/index.js b/app/assets/javascripts/groups/members/index.js
new file mode 100644
index 00000000000..68fab42b543
--- /dev/null
+++ b/app/assets/javascripts/groups/members/index.js
@@ -0,0 +1,32 @@
+import Vue from 'vue';
+import App from './components/app.vue';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+
+export default el => {
+  if (!el) {
+    return () => {};
+  }
+
+  return new Vue({
+    el,
+    components: { App },
+    data() {
+      const { members, groupId, currentUserId } = this.$options.el.dataset;
+
+      return {
+        members: convertObjectPropsToCamelCase(JSON.parse(members), { deep: true }),
+        groupId: parseInt(groupId, 10),
+        ...(currentUserId ? { currentUserId: parseInt(currentUserId, 10) } : {}),
+      };
+    },
+    render(createElement) {
+      return createElement('app', {
+        props: {
+          members: this.members,
+          groupId: this.groupId,
+          currentUserId: this.currentUserId,
+        },
+      });
+    },
+  });
+};