diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 21:09:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 21:09:58 +0300 |
| commit | 88bff01768a8bc56114d9295a7f20a73c23ffc95 (patch) | |
| tree | 3551191176a705824761e8cb6b9c80dc911e2244 /app/assets/javascripts/notes | |
| parent | 241adb8894b42f48e85ef5d2f1d831ecb2e7556f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/note_form.vue | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 54fcf41ca50..4e39f550a88 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -371,6 +371,7 @@ export default { :markdown-docs-path="markdownDocsPath" :quick-actions-docs-path="quickActionsDocsPath" :add-spacing-classes="false" + :textarea-value="note" > <textarea id="note-body" diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 88b4461cf38..61beb9a90cf 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -328,6 +328,7 @@ export default { :add-spacing-classes="false" :help-page-path="helpPagePath" :show-suggest-popover="showSuggestPopover" + :textarea-value="updatedNoteBody" @handleSuggestDismissed="() => $emit('handleSuggestDismissed')" > <textarea |