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-05-06 18:09:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-06 18:09:42 +0300
commita7beadc83470bd9ce23757a019795f49f95a6fff (patch)
treecb9ddaa8ea3eaf03b75184e682aef520ff46fc3f /spec/frontend/__mocks__
parent4279f24a19836d3e74e4aae8bea7acc2dd8222cc (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.js3
1 files changed, 3 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 03279fc56a4..91bcef5cb62 100644
--- a/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
+++ b/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
@@ -10,6 +10,9 @@ export const Editor = {
initialEditType: {
type: String,
},
+ height: {
+ type: String,
+ },
},
render(h) {
return h('div');