From 04baa85554ff13bdd4d6f4e6bb24119d17608fee Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 09:09:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../static_site_editor/components/edit_area.vue | 18 +++++++++++ .../components/static_site_editor.vue | 36 +++++++++++++++++++++- .../javascripts/static_site_editor/store/state.js | 3 ++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/static_site_editor/components/edit_area.vue (limited to 'app/assets/javascripts/static_site_editor') diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue new file mode 100644 index 00000000000..921d93669c5 --- /dev/null +++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue @@ -0,0 +1,18 @@ + + 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 index 7b8b46cb048..4a0e153eb33 100644 --- a/app/assets/javascripts/static_site_editor/components/static_site_editor.vue +++ b/app/assets/javascripts/static_site_editor/components/static_site_editor.vue @@ -1,3 +1,37 @@ + diff --git a/app/assets/javascripts/static_site_editor/store/state.js b/app/assets/javascripts/static_site_editor/store/state.js index 512967cc3d9..68a7f95760c 100644 --- a/app/assets/javascripts/static_site_editor/store/state.js +++ b/app/assets/javascripts/static_site_editor/store/state.js @@ -1,4 +1,7 @@ const createState = (initialState = {}) => ({ + isLoadingContent: false, + isContentLoaded: false, + content: '', ...initialState, }); -- cgit v1.2.1