diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-12 12:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-12 12:09:19 +0300 |
| commit | 447c1bba679be70f9c311326ca03923c6988f127 (patch) | |
| tree | feef28edad5bf8c6b6f0be27f929ae6b6119e8a1 /app/assets/javascripts/vue_shared/components | |
| parent | 09acddd7fd2b59afa69eca95b1e34739e1f1b31b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/header.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 00390194414..0c6a9c2fa98 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -214,6 +214,7 @@ export default { : description; if (textArea) { + textArea.value = ''; updateText({ textArea, tag: `${text}\n\n---\n\n_${addendum}_`, diff --git a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js index b7b154bfc23..2aa8f3b2442 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js +++ b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js @@ -8,8 +8,8 @@ import { CLEAR_AUTOSAVE_ENTRY_EVENT } from '../../constants'; import MarkdownEditor from './markdown_editor.vue'; import eventHub from './eventhub'; -export const MR_SOURCE_BRANCH = 'merge_request[source_branch]'; -export const MR_TARGET_BRANCH = 'merge_request[target_branch]'; +const MR_SOURCE_BRANCH = 'merge_request[source_branch]'; +const MR_TARGET_BRANCH = 'merge_request[target_branch]'; function organizeQuery(obj, isFallbackKey = false) { if (!obj[MR_SOURCE_BRANCH] && !obj[MR_TARGET_BRANCH]) { |