Add latest changes from gitlab-org/gitlab@master

4 files changed, 42 insertions, 0 deletions

diff --git a/app/assets/javascripts/static_site_editor/components/static_site_editor.vue b/app/assets/javascripts/static_site_editor/components/static_site_editor.vue
new file mode 100644
index 00000000000..7b8b46cb048
--- /dev/null
+++ b/app/assets/javascripts/static_site_editor/components/static_site_editor.vue
@@ -0,0 +1,3 @@
+<template>
+  <div></div>
+</template>
diff --git a/app/assets/javascripts/static_site_editor/index.js b/app/assets/javascripts/static_site_editor/index.js
new file mode 100644
index 00000000000..4290cb9a9ba
--- /dev/null
+++ b/app/assets/javascripts/static_site_editor/index.js
@@ -0,0 +1,20 @@
+import Vue from 'vue';
+import StaticSiteEditor from './components/static_site_editor.vue';
+import createStore from './store';
+
+const initStaticSiteEditor = el => {
+  const store = createStore();
+
+  return new Vue({
+    el,
+    store,
+    components: {
+      StaticSiteEditor,
+    },
+    render(createElement) {
+      return createElement('static-site-editor', StaticSiteEditor);
+    },
+  });
+};
+
+export default initStaticSiteEditor;
diff --git a/app/assets/javascripts/static_site_editor/store/index.js b/app/assets/javascripts/static_site_editor/store/index.js
new file mode 100644
index 00000000000..653c2532ee6
--- /dev/null
+++ b/app/assets/javascripts/static_site_editor/store/index.js
@@ -0,0 +1,13 @@
+import Vuex from 'vuex';
+import Vue from 'vue';
+import createState from './state';
+
+Vue.use(Vuex);
+
+const createStore = ({ initialState } = {}) => {
+  return new Vuex.Store({
+    state: createState(initialState),
+  });
+};
+
+export default createStore;
diff --git a/app/assets/javascripts/static_site_editor/store/state.js b/app/assets/javascripts/static_site_editor/store/state.js
new file mode 100644
index 00000000000..512967cc3d9
--- /dev/null
+++ b/app/assets/javascripts/static_site_editor/store/state.js
@@ -0,0 +1,6 @@
+const createState = (initialState = {}) => ({
+  content: '',
+  ...initialState,
+});
+
+export default createState;