Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-29 21:09:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-29 21:09:56 +0300
commit6f2dc439265369de7b1e1b18b208c6d66cf260eb (patch)
treec961526575126eafdd022ae7b496830dcf252002 /spec/frontend/__mocks__
parent647de7e6fd971d435396cc8730a2d162240e3d7c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/__mocks__')
-rw-r--r--spec/frontend/__mocks__/@toast-ui/vue-editor/index.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js b/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
index 5ca620c24cf..03279fc56a4 100644
--- a/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
+++ b/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
@@ -4,6 +4,12 @@ export const Editor = {
type: String,
required: true,
},
+ options: {
+ type: Object,
+ },
+ initialEditType: {
+ type: String,
+ },
},
render(h) {
return h('div');