summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-11-16 21:07:05 +1100
committerSimon Knox <psimyn@gmail.com>2017-11-16 21:07:05 +1100
commitbc6ae112f2090c778976c5793ce7d2cfd6254831 (patch)
tree574b792f9ebcf34c32d735b14ed4c1834e566668
parente0565e8bc91e7a360c13d5c14ac7e412f2000255 (diff)
downloadgitlab-ce-vue-shared-notes.tar.gz
rename note signed out widgetvue-shared-notes
-rw-r--r--app/assets/javascripts/notes/components/issue_comment_form.vue8
-rw-r--r--app/assets/javascripts/notes/components/issue_discussion.vue8
-rw-r--r--app/assets/javascripts/vue_shared/components/notes/note_signed_out_widget.vue (renamed from app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue)0
-rw-r--r--spec/javascripts/vue_shared/components/notes/note_signed_out_widget_spec.js (renamed from spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js)6
4 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index 30e02554b65..24ad9dea900 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -7,8 +7,8 @@
import TaskList from '../../task_list';
import * as constants from '../constants';
import eventHub from '../event_hub';
- import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
- import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue';
+ import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
+ import noteSignedOutWidget from '~/vue_shared/components/notes/note_signed_out_widget.vue';
import issueDiscussionLockedWidget from './issue_discussion_locked_widget.vue';
import markdownField from '../../vue_shared/components/markdown/field.vue';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
@@ -29,7 +29,7 @@
},
components: {
issueWarning,
- issueNoteSignedOutWidget,
+ noteSignedOutWidget,
issueDiscussionLockedWidget,
markdownField,
userAvatarLink,
@@ -240,7 +240,7 @@
<template>
<div>
- <issue-note-signed-out-widget v-if="!isLoggedIn" />
+ <note-signed-out-widget v-if="!isLoggedIn" />
<issue-discussion-locked-widget v-else-if="!canCreateNote" />
<ul
v-else
diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue
index 26bac28b5fe..3481f9bae05 100644
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -6,10 +6,10 @@
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import issueNoteHeader from '~/vue_shared/components/notes/note_header.vue';
import issueNoteActions from './issue_note_actions.vue';
- import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue';
+ import noteSignedOutWidget from '~/vue_shared/components/notes/note_signed_out_widget.vue';
import issueNoteEditedText from './issue_note_edited_text.vue';
import issueNoteForm from './issue_note_form.vue';
- import placeholderNote from '../../vue_shared/components/notes/placeholder_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';
@@ -30,7 +30,7 @@
userAvatarLink,
issueNoteHeader,
issueNoteActions,
- issueNoteSignedOutWidget,
+ noteSignedOutWidget,
issueNoteEditedText,
issueNoteForm,
placeholderNote,
@@ -220,7 +220,7 @@
@cancelFormEdition="cancelReplyForm"
ref="noteForm"
/>
- <issue-note-signed-out-widget v-if="!canReply" />
+ <note-signed-out-widget v-if="!canReply" />
</div>
</div>
</div>
diff --git a/app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue b/app/assets/javascripts/vue_shared/components/notes/note_signed_out_widget.vue
index 77af3594c1c..77af3594c1c 100644
--- a/app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/note_signed_out_widget.vue
diff --git a/spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js b/spec/javascripts/vue_shared/components/notes/note_signed_out_widget_spec.js
index f20d9ce9268..413384f3342 100644
--- a/spec/javascripts/notes/components/issue_note_signed_out_widget_spec.js
+++ b/spec/javascripts/vue_shared/components/notes/note_signed_out_widget_spec.js
@@ -1,13 +1,13 @@
import Vue from 'vue';
-import issueNoteSignedOut from '~/notes/components/issue_note_signed_out_widget.vue';
+import noteSignedOut from '~/vue_shared/components/notes/note_signed_out_widget.vue';
import store from '~/notes/stores';
import { notesDataMock } from '../mock_data';
-describe('issue_note_signed_out_widget component', () => {
+describe('note_signed_out_widget', () => {
let vm;
beforeEach(() => {
- const Component = Vue.extend(issueNoteSignedOut);
+ const Component = Vue.extend(noteSignedOut);
store.dispatch('setNotesData', notesDataMock);
vm = new Component({