summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-06-14 14:01:24 +0100
committerPhil Hughes <me@iamphill.com>2019-06-14 14:01:24 +0100
commitd2fd6bd51036be836c2c793e2bd7a503c7ad9030 (patch)
treefe86f4b3dca7f33ec37be2c75ea061afafcdb4fe /app/assets/javascripts/notes
parent577832598f1b35187efafc426068ef7ac36ae09f (diff)
downloadgitlab-ce-d2fd6bd51036be836c2c793e2bd7a503c7ad9030.tar.gz
Added diff suggestion popover
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r--app/assets/javascripts/notes/components/note_form.vue9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 09ecb695214..042ed196933 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -77,6 +77,11 @@ export default {
required: false,
default: '',
},
+ showSuggestPopover: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
data() {
let updatedNoteBody = this.noteBody;
@@ -247,6 +252,8 @@ export default {
:can-suggest="canSuggest"
:add-spacing-classes="false"
:help-page-path="helpPagePath"
+ :show-suggest-popover="showSuggestPopover"
+ @handleSuggestDismissed="() => $emit('handleSuggestDismissed')"
>
<textarea
id="note_note"
@@ -303,7 +310,7 @@ export default {
{{ __('Add comment now') }}
</button>
<button
- class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
+ class="btn note-edit-cancel js-close-discussion-note-form"
type="button"
@click="cancelHandler()"
>