Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
ba87878e
Commit
ba87878e
authored
7 years ago
by
Simon Knox
Browse files
Options
Download
Email Patches
Plain Diff
fix import order lint
parent
292f81bb
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
20 additions
and
20 deletions
+20
-20
app/assets/javascripts/vue_shared/notes/components/comment_form.vue
.../javascripts/vue_shared/notes/components/comment_form.vue
+3
-3
app/assets/javascripts/vue_shared/notes/components/note_body.vue
...ets/javascripts/vue_shared/notes/components/note_body.vue
+1
-1
app/assets/javascripts/vue_shared/notes/components/note_form.vue
...ets/javascripts/vue_shared/notes/components/note_form.vue
+1
-1
app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
...ripts/vue_shared/notes/components/noteable_discussion.vue
+3
-3
app/assets/javascripts/vue_shared/notes/components/notes_app.vue
...ets/javascripts/vue_shared/notes/components/notes_app.vue
+5
-5
app/assets/javascripts/vue_shared/notes/stores/actions.js
app/assets/javascripts/vue_shared/notes/stores/actions.js
+3
-3
spec/javascripts/vue_shared/notes/components/comment_form_spec.js
...ascripts/vue_shared/notes/components/comment_form_spec.js
+1
-1
spec/javascripts/vue_shared/notes/components/note_form_spec.js
...javascripts/vue_shared/notes/components/note_form_spec.js
+1
-1
spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js
...ipts/vue_shared/notes/components/placeholder_note_spec.js
+1
-1
spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js
...e_shared/notes/components/placeholder_system_note_spec.js
+0
-0
spec/javascripts/vue_shared/notes/components/system_note_spec.js
...vascripts/vue_shared/notes/components/system_note_spec.js
+0
-0
spec/javascripts/vue_shared/notes/stores/actions_spec.js
spec/javascripts/vue_shared/notes/stores/actions_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/notes/components/comment_form.vue
View file @
ba87878e
...
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/notes/components/note_body.vue
View file @
ba87878e
<
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
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/notes/components/note_form.vue
View file @
ba87878e
<
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
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
View file @
ba87878e
<
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
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/notes/components/notes_app.vue
View file @
ba87878e
<
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
'
,
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/notes/stores/actions.js
View file @
ba87878e
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
;
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/components/comment_form_spec.js
View file @
ba87878e
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/components/note_form_spec.js
View file @
ba87878e
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/components/
notes/
placeholder_note_spec.js
→
spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js
View file @
ba87878e
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
;
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/components/
notes/
placeholder_system_note_spec.js
→
spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js
View file @
ba87878e
File moved
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/components/
notes/
system_note_spec.js
→
spec/javascripts/vue_shared/notes/components/system_note_spec.js
View file @
ba87878e
File moved
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/notes/stores/actions_spec.js
View file @
ba87878e
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
'
,
()
=>
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment