diff --git a/app/assets/javascripts/notes/components/discussion_resolve_button.vue b/app/assets/javascripts/notes/components/discussion_resolve_button.vue new file mode 100644 index 0000000000000000000000000000000000000000..2b29d7102362932bb7ca13f5da60b4a5f3bcd287 --- /dev/null +++ b/app/assets/javascripts/notes/components/discussion_resolve_button.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 8add7278f9b5eb56caf8fc569e0d8b96324cb423..695efe3602f9c6282f7a8b38fd920e5d722dd785 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -12,6 +12,7 @@ import { SYSTEM_NOTE } from '../constants'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import noteableNote from './noteable_note.vue'; import noteHeader from './note_header.vue'; +import resolveDiscussionButton from './discussion_resolve_button.vue'; import toggleRepliesWidget from './toggle_replies_widget.vue'; import noteSignedOutWidget from './note_signed_out_widget.vue'; import noteEditedText from './note_edited_text.vue'; @@ -35,6 +36,7 @@ export default { noteSignedOutWidget, noteEditedText, noteForm, + resolveDiscussionButton, jumpToNextDiscussionButton, toggleRepliesWidget, placeholderNote, @@ -453,16 +455,12 @@ Please check your network connection and try again.`; > Reply... -