diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-27 21:56:03 +0100 |
| commit | 496c750e3f387624fd51a37954efe87ef6b465bd (patch) | |
| tree | b94bd0e1b1e0e7ae179cd2cdb91aa194d7276eb2 /app/assets/javascripts/notes/components/issue_discussion.vue | |
| parent | 90b06afdeaa13fe14218a53c8afbc4802af53a27 (diff) | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-496c750e3f387624fd51a37954efe87ef6b465bd.tar.gz | |
Merge branch 'master' into ph-multi-file-upload-fileph-multi-file-upload-file
Diffstat (limited to 'app/assets/javascripts/notes/components/issue_discussion.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/issue_discussion.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue index baf43190d9e..0f13221b81e 100644 --- a/app/assets/javascripts/notes/components/issue_discussion.vue +++ b/app/assets/javascripts/notes/components/issue_discussion.vue @@ -9,8 +9,8 @@ import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue'; import issueNoteEditedText from './issue_note_edited_text.vue'; import issueNoteForm from './issue_note_form.vue'; - import placeholderNote from './issue_placeholder_note.vue'; - import placeholderSystemNote from './issue_placeholder_system_note.vue'; + import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue'; + import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue'; import autosave from '../mixins/autosave'; export default { |