diff options
author | Simon Knox <psimyn@gmail.com> | 2017-11-30 19:13:26 +1100 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2017-11-30 19:15:02 +1100 |
commit | bbcea8b6062a712fa4d457c0d69d6fc5897e5c3d (patch) | |
tree | 355741c421793d4817a7a54edb26321840658d00 | |
parent | 292f81bbaf788d2eeadfa03b151ccc33de40ed6b (diff) | |
download | gitlab-ce-mr-vue-note.tar.gz |
fix import order lintmr-vue-note
12 files changed, 20 insertions, 20 deletions
diff --git a/app/assets/javascripts/vue_shared/notes/components/comment_form.vue b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue index 413e143d949..ccb94fefb6d 100644 --- a/app/assets/javascripts/vue_shared/notes/components/comment_form.vue +++ b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue @@ -5,13 +5,13 @@ import Flash from '~/flash'; import Autosave from '~/autosave'; import TaskList from '~/task_list'; + import markdownField from '~/vue_shared/components/markdown/field.vue'; + import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; + import issueWarning from '~/vue_shared/components/issue/issue_warning.vue'; import * as constants from '../constants'; import eventHub from '../event_hub'; - import issueWarning from '~/vue_shared/components/issue/issue_warning.vue'; import noteSignedOutWidget from './note_signed_out_widget.vue'; import discussionLockedWidget from './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'; import issuableStateMixin from '../mixins/issuable_state'; export default { diff --git a/app/assets/javascripts/vue_shared/notes/components/note_body.vue b/app/assets/javascripts/vue_shared/notes/components/note_body.vue index 33b1eb945f2..2fbd882f415 100644 --- a/app/assets/javascripts/vue_shared/notes/components/note_body.vue +++ b/app/assets/javascripts/vue_shared/notes/components/note_body.vue @@ -1,9 +1,9 @@ <script> + import TaskList from '~/task_list'; import noteEditedText from './note_edited_text.vue'; import noteAwardsList from './note_awards_list.vue'; import noteAttachment from './note_attachment.vue'; import noteForm from './note_form.vue'; - import TaskList from '~/task_list'; import autosave from '../mixins/autosave'; export default { diff --git a/app/assets/javascripts/vue_shared/notes/components/note_form.vue b/app/assets/javascripts/vue_shared/notes/components/note_form.vue index 48bf08ba554..5e2b4ebf26e 100644 --- a/app/assets/javascripts/vue_shared/notes/components/note_form.vue +++ b/app/assets/javascripts/vue_shared/notes/components/note_form.vue @@ -1,8 +1,8 @@ <script> import { mapGetters } from 'vuex'; - import eventHub from '../event_hub'; import issueWarning from '~/vue_shared/components/issue/issue_warning.vue'; import markdownField from '~/vue_shared/components/markdown/field.vue'; + import eventHub from '../event_hub'; import issuableStateMixin from '../mixins/issuable_state'; export default { diff --git a/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue index 5b37b74b604..4e000be2eb3 100644 --- a/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue @@ -1,15 +1,15 @@ <script> import { mapActions, mapGetters } from 'vuex'; import Flash from '~/flash'; - import { SYSTEM_NOTE } from '../constants'; import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; + import { SYSTEM_NOTE } from '../constants'; import noteHeader from './note_header.vue'; import noteSignedOutWidget from './note_signed_out_widget.vue'; import noteEditedText from './note_edited_text.vue'; import noteForm from './note_form.vue'; import noteableNote from './noteable_note.vue'; - import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue'; - import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue'; + import placeholderNote from './placeholder_note.vue'; + import placeholderSystemNote from './placeholder_system_note.vue'; import autosave from '../mixins/autosave'; export default { diff --git a/app/assets/javascripts/vue_shared/notes/components/notes_app.vue b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue index 12f25ef9f44..a0f387586df 100644 --- a/app/assets/javascripts/vue_shared/notes/components/notes_app.vue +++ b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue @@ -1,15 +1,15 @@ <script> import { mapGetters, mapActions } from 'vuex'; import Flash from '~/flash'; - import store from '../stores/'; - import * as constants from '../constants'; - import noteableNote from './noteable_note.vue'; - import noteableDiscussion from './noteable_discussion.vue'; import systemNote from '~/vue_shared/notes/components/system_note.vue'; - import commentForm from './comment_form.vue'; import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue'; import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue'; import loadingIcon from '~/vue_shared/components/loading_icon.vue'; + import noteableDiscussion from './noteable_discussion.vue'; + import store from '../stores/'; + import * as constants from '../constants'; + import noteableNote from './noteable_note.vue'; + import commentForm from './comment_form.vue'; export default { name: 'notesApp', diff --git a/app/assets/javascripts/vue_shared/notes/stores/actions.js b/app/assets/javascripts/vue_shared/notes/stores/actions.js index 957f642bce7..3b87ccdc92e 100644 --- a/app/assets/javascripts/vue_shared/notes/stores/actions.js +++ b/app/assets/javascripts/vue_shared/notes/stores/actions.js @@ -1,13 +1,13 @@ import Visibility from 'visibilityjs'; import Flash from '~/flash'; import Poll from '~/lib/utils/poll'; +import loadAwardsHandler from '~/awards_handler'; +import sidebarTimeTrackingEventHub from '~/sidebar/event_hub'; +import { isInViewport, scrollToElement } from '~/lib/utils/common_utils'; import * as types from './mutation_types'; import * as utils from './utils'; import * as constants from '../constants'; import service from '../services/notes_service'; -import loadAwardsHandler from '~/awards_handler'; -import sidebarTimeTrackingEventHub from '~/sidebar/event_hub'; -import { isInViewport, scrollToElement } from '~/lib/utils/common_utils'; let eTagPoll; diff --git a/spec/javascripts/vue_shared/notes/components/comment_form_spec.js b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js index 516e1b1b192..7741c99f78d 100644 --- a/spec/javascripts/vue_shared/notes/components/comment_form_spec.js +++ b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js @@ -3,7 +3,7 @@ import Autosize from 'autosize'; import store from '~/vue_shared/notes/stores'; import issueCommentForm from '~/vue_shared/notes/components/comment_form.vue'; import { loggedOutnoteableData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data'; -import { keyboardDownEvent } from '../../issue_show/helpers'; +import { keyboardDownEvent } from '../../../issue_show/helpers'; describe('issue_comment_form component', () => { let vm; diff --git a/spec/javascripts/vue_shared/notes/components/note_form_spec.js b/spec/javascripts/vue_shared/notes/components/note_form_spec.js index 4c56057b448..2819e07a3ca 100644 --- a/spec/javascripts/vue_shared/notes/components/note_form_spec.js +++ b/spec/javascripts/vue_shared/notes/components/note_form_spec.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import store from '~/vue_shared/notes/stores'; import issueNoteForm from '~/vue_shared/notes/components/note_form.vue'; import { noteableDataMock, notesDataMock } from '../mock_data'; -import { keyboardDownEvent } from '../../issue_show/helpers'; +import { keyboardDownEvent } from '../../../issue_show/helpers'; describe('issue_note_form component', () => { let vm; diff --git a/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js b/spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js index 7c4123e70ed..6d19d2154e3 100644 --- a/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js +++ b/spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import issuePlaceholderNote from '~/vue_shared/notes/components/placeholder_note.vue'; import store from '~/vue_shared/notes/stores'; -import { userDataMock } from '../../../notes/mock_data'; +import { userDataMock } from '../mock_data'; describe('issue placeholder system note component', () => { let vm; diff --git a/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js b/spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js index 2b7398bcefe..2b7398bcefe 100644 --- a/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js +++ b/spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js diff --git a/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js b/spec/javascripts/vue_shared/notes/components/system_note_spec.js index 60e591d9d5f..60e591d9d5f 100644 --- a/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js +++ b/spec/javascripts/vue_shared/notes/components/system_note_spec.js diff --git a/spec/javascripts/vue_shared/notes/stores/actions_spec.js b/spec/javascripts/vue_shared/notes/stores/actions_spec.js index 46b4f5f2163..a5fa36a353f 100644 --- a/spec/javascripts/vue_shared/notes/stores/actions_spec.js +++ b/spec/javascripts/vue_shared/notes/stores/actions_spec.js @@ -1,5 +1,5 @@ import * as actions from '~/vue_shared/notes/stores/actions'; -import testAction from '../../helpers/vuex_action_helper'; +import testAction from '../../../helpers/vuex_action_helper'; import { discussionMock, notesDataMock, userDataMock, noteableDataMock, individualNote } from '../mock_data'; describe('Actions Notes Store', () => { |