diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
| commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
| tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue | |
| parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue')
| -rw-r--r-- | app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue index c28de88554a..8ef31b9b983 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue @@ -60,7 +60,7 @@ export default { contentEditor: { renderFailed: { message: s__( - 'WikiPage|An error occured while trying to render the content editor. Please try again later.', + 'WikiPage|An error occurred while trying to render the content editor. Please try again later.', ), primaryAction: s__('WikiPage|Retry'), }, @@ -495,6 +495,7 @@ export default { :textarea-value="content" :markdown-docs-path="pageInfo.markdownHelpPath" :uploads-path="pageInfo.uploadsPath" + :enable-preview="isMarkdownFormat" class="bordered-box" > <template #textarea> |