Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
874deb41
Commit
874deb41
authored
Dec 09, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename remaining issue_ prefixed files
parent
d32032de
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
36 additions
and
36 deletions
+36
-36
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+1
-1
app/assets/javascripts/notes/components/note_body.vue
app/assets/javascripts/notes/components/note_body.vue
+3
-3
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+0
-0
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+6
-6
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+3
-3
app/assets/javascripts/notes/components/notes_app.vue
app/assets/javascripts/notes/components/notes_app.vue
+11
-11
app/assets/javascripts/notes/index.js
app/assets/javascripts/notes/index.js
+3
-3
spec/javascripts/notes/components/comment_form_spec.js
spec/javascripts/notes/components/comment_form_spec.js
+1
-1
spec/javascripts/notes/components/note_app_spec.js
spec/javascripts/notes/components/note_app_spec.js
+3
-3
spec/javascripts/notes/components/note_body_spec.js
spec/javascripts/notes/components/note_body_spec.js
+1
-1
spec/javascripts/notes/components/note_form_spec.js
spec/javascripts/notes/components/note_form_spec.js
+1
-1
spec/javascripts/notes/components/noteable_discussion_spec.js
.../javascripts/notes/components/noteable_discussion_spec.js
+2
-2
spec/javascripts/notes/components/noteable_note_spec.js
spec/javascripts/notes/components/noteable_note_spec.js
+1
-1
No files found.
app/assets/javascripts/notes/components/
issue_
comment_form.vue
→
app/assets/javascripts/notes/components/comment_form.vue
View file @
874deb41
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
export
default
{
export
default
{
name
:
'
issueC
ommentForm
'
,
name
:
'
c
ommentForm
'
,
data
()
{
data
()
{
return
{
return
{
note
:
''
,
note
:
''
,
...
...
app/assets/javascripts/notes/components/
issue_
note_body.vue
→
app/assets/javascripts/notes/components/note_body.vue
View file @
874deb41
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
import
issueNoteForm
from
'
./issue_
note_form.vue
'
;
import
noteForm
from
'
./
note_form.vue
'
;
import
TaskList
from
'
../../task_list
'
;
import
TaskList
from
'
../../task_list
'
;
import
autosave
from
'
../mixins/autosave
'
;
import
autosave
from
'
../mixins/autosave
'
;
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
noteEditedText
,
noteEditedText
,
noteAwardsList
,
noteAwardsList
,
noteAttachment
,
noteAttachment
,
issueN
oteForm
,
n
oteForm
,
},
},
computed
:
{
computed
:
{
noteBody
()
{
noteBody
()
{
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
<div
<div
v-html=
"note.note_html"
v-html=
"note.note_html"
class=
"note-text md"
></div>
class=
"note-text md"
></div>
<
issue-
note-form
<note-form
v-if=
"isEditing"
v-if=
"isEditing"
ref=
"noteForm"
ref=
"noteForm"
@
handleFormUpdate=
"handleFormUpdate"
@
handleFormUpdate=
"handleFormUpdate"
...
...
app/assets/javascripts/notes/components/
issue_
note_form.vue
→
app/assets/javascripts/notes/components/note_form.vue
View file @
874deb41
File moved
app/assets/javascripts/notes/components/
issu
e_discussion.vue
→
app/assets/javascripts/notes/components/
noteabl
e_discussion.vue
View file @
874deb41
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
issueNote
from
'
./issue_note.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
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
noteHeader
from
'
./note_header.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
issueNoteForm
from
'
./issue_
note_form.vue
'
;
import
noteForm
from
'
./
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
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
autosave
from
'
../mixins/autosave
'
;
import
autosave
from
'
../mixins/autosave
'
;
...
@@ -25,12 +25,12 @@
...
@@ -25,12 +25,12 @@
};
};
},
},
components
:
{
components
:
{
issu
eNote
,
noteabl
eNote
,
userAvatarLink
,
userAvatarLink
,
noteHeader
,
noteHeader
,
noteSignedOutWidget
,
noteSignedOutWidget
,
noteEditedText
,
noteEditedText
,
issueN
oteForm
,
n
oteForm
,
placeholderNote
,
placeholderNote
,
placeholderSystemNote
,
placeholderSystemNote
,
},
},
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
return
placeholderNote
;
return
placeholderNote
;
}
}
return
issu
eNote
;
return
noteabl
eNote
;
},
},
componentData
(
note
)
{
componentData
(
note
)
{
return
note
.
isPlaceholderNote
?
note
.
notes
[
0
]
:
note
;
return
note
.
isPlaceholderNote
?
note
.
notes
[
0
]
:
note
;
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
type=
"button"
type=
"button"
class=
"js-vue-discussion-reply btn btn-text-field"
class=
"js-vue-discussion-reply btn btn-text-field"
title=
"Add a reply"
>
Reply...
</button>
title=
"Add a reply"
>
Reply...
</button>
<
issue-
note-form
<note-form
v-if=
"isReplying"
v-if=
"isReplying"
save-button-title=
"Comment"
save-button-title=
"Comment"
:discussion=
"note"
:discussion=
"note"
...
...
app/assets/javascripts/notes/components/
issu
e_note.vue
→
app/assets/javascripts/notes/components/
noteabl
e_note.vue
View file @
874deb41
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteActions
from
'
./note_actions.vue
'
;
import
noteActions
from
'
./note_actions.vue
'
;
import
issueNoteBody
from
'
./issue_
note_body.vue
'
;
import
noteBody
from
'
./
note_body.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
export
default
{
export
default
{
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
userAvatarLink
,
userAvatarLink
,
noteHeader
,
noteHeader
,
noteActions
,
noteActions
,
issueN
oteBody
,
n
oteBody
,
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
...
@@ -173,7 +173,7 @@
...
@@ -173,7 +173,7 @@
@
handleDelete=
"deleteHandler"
@
handleDelete=
"deleteHandler"
/>
/>
</div>
</div>
<
issue-
note-body
<note-body
:note=
"note"
:note=
"note"
:can-edit=
"note.current_user.can_edit"
:can-edit=
"note.current_user.can_edit"
:is-editing=
"isEditing"
:is-editing=
"isEditing"
...
...
app/assets/javascripts/notes/components/
issue_
notes_app.vue
→
app/assets/javascripts/notes/components/notes_app.vue
View file @
874deb41
...
@@ -3,16 +3,16 @@
...
@@ -3,16 +3,16 @@
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
store
from
'
../stores/
'
;
import
store
from
'
../stores/
'
;
import
*
as
constants
from
'
../constants
'
;
import
*
as
constants
from
'
../constants
'
;
import
issueNote
from
'
./issu
e_note.vue
'
;
import
noteableNote
from
'
./noteabl
e_note.vue
'
;
import
issueDiscussion
from
'
./issu
e_discussion.vue
'
;
import
noteableDiscussion
from
'
./noteabl
e_discussion.vue
'
;
import
systemNote
from
'
../../vue_shared/components/notes/system_note.vue
'
;
import
systemNote
from
'
../../vue_shared/components/notes/system_note.vue
'
;
import
issueCommentForm
from
'
./issue_
comment_form.vue
'
;
import
commentForm
from
'
./
comment_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
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
export
default
{
export
default
{
name
:
'
issueN
otesApp
'
,
name
:
'
n
otesApp
'
,
props
:
{
props
:
{
noteableData
:
{
noteableData
:
{
type
:
Object
,
type
:
Object
,
...
@@ -35,10 +35,10 @@
...
@@ -35,10 +35,10 @@
};
};
},
},
components
:
{
components
:
{
issu
eNote
,
noteabl
eNote
,
issu
eDiscussion
,
noteabl
eDiscussion
,
systemNote
,
systemNote
,
issueC
ommentForm
,
c
ommentForm
,
loadingIcon
,
loadingIcon
,
placeholderNote
,
placeholderNote
,
placeholderSystemNote
,
placeholderSystemNote
,
...
@@ -68,10 +68,10 @@
...
@@ -68,10 +68,10 @@
}
}
return
placeholderNote
;
return
placeholderNote
;
}
else
if
(
note
.
individual_note
)
{
}
else
if
(
note
.
individual_note
)
{
return
note
.
notes
[
0
].
system
?
systemNote
:
issu
eNote
;
return
note
.
notes
[
0
].
system
?
systemNote
:
noteabl
eNote
;
}
}
return
issu
eDiscussion
;
return
noteabl
eDiscussion
;
},
},
getComponentData
(
note
)
{
getComponentData
(
note
)
{
return
note
.
individual_note
?
note
.
notes
[
0
]
:
note
;
return
note
.
individual_note
?
note
.
notes
[
0
]
:
note
;
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
.
then
(()
=>
this
.
checkLocationHash
())
.
then
(()
=>
this
.
checkLocationHash
())
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
Flash
(
'
Something went wrong while fetching
issue
comments. Please try again.
'
);
Flash
(
'
Something went wrong while fetching comments. Please try again.
'
);
});
});
},
},
initPolling
()
{
initPolling
()
{
...
@@ -146,6 +146,6 @@
...
@@ -146,6 +146,6 @@
/>
/>
</ul>
</ul>
<
issue-
comment-form
/>
<comment-form
/>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/notes/index.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
issueNotesApp
from
'
./components/issue_
notes_app.vue
'
;
import
notesApp
from
'
./components/
notes_app.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
el
:
'
#js-vue-notes
'
,
el
:
'
#js-vue-notes
'
,
components
:
{
components
:
{
issueN
otesApp
,
n
otesApp
,
},
},
data
()
{
data
()
{
const
notesDataset
=
document
.
getElementById
(
'
js-vue-notes
'
).
dataset
;
const
notesDataset
=
document
.
getElementById
(
'
js-vue-notes
'
).
dataset
;
...
@@ -32,7 +32,7 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
...
@@ -32,7 +32,7 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
};
};
},
},
render
(
createElement
)
{
render
(
createElement
)
{
return
createElement
(
'
issue-
notes-app
'
,
{
return
createElement
(
'
notes-app
'
,
{
props
:
{
props
:
{
noteableData
:
this
.
noteableData
,
noteableData
:
this
.
noteableData
,
notesData
:
this
.
notesData
,
notesData
:
this
.
notesData
,
...
...
spec/javascripts/notes/components/
issue_
comment_form_spec.js
→
spec/javascripts/notes/components/comment_form_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Autosize
from
'
autosize
'
;
import
Autosize
from
'
autosize
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
issueCommentForm
from
'
~/notes/components/
issue_
comment_form.vue
'
;
import
issueCommentForm
from
'
~/notes/components/comment_form.vue
'
;
import
{
loggedOutnoteableData
,
notesDataMock
,
userDataMock
,
noteableDataMock
}
from
'
../mock_data
'
;
import
{
loggedOutnoteableData
,
notesDataMock
,
userDataMock
,
noteableDataMock
}
from
'
../mock_data
'
;
import
{
keyboardDownEvent
}
from
'
../../issue_show/helpers
'
;
import
{
keyboardDownEvent
}
from
'
../../issue_show/helpers
'
;
...
...
spec/javascripts/notes/components/
issue_
note_app_spec.js
→
spec/javascripts/notes/components/note_app_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
issueNotesApp
from
'
~/notes/components/issue_
notes_app.vue
'
;
import
notesApp
from
'
~/notes/components/
notes_app.vue
'
;
import
service
from
'
~/notes/services/notes_service
'
;
import
service
from
'
~/notes/services/notes_service
'
;
import
*
as
mockData
from
'
../mock_data
'
;
import
*
as
mockData
from
'
../mock_data
'
;
describe
(
'
issue_
note_app
'
,
()
=>
{
describe
(
'
note_app
'
,
()
=>
{
let
mountComponent
;
let
mountComponent
;
let
vm
;
let
vm
;
...
@@ -20,7 +20,7 @@ describe('issue_note_app', () => {
...
@@ -20,7 +20,7 @@ describe('issue_note_app', () => {
};
};
beforeEach
(()
=>
{
beforeEach
(()
=>
{
const
IssueNotesApp
=
Vue
.
extend
(
issueN
otesApp
);
const
IssueNotesApp
=
Vue
.
extend
(
n
otesApp
);
mountComponent
=
(
data
)
=>
{
mountComponent
=
(
data
)
=>
{
const
props
=
data
||
{
const
props
=
data
||
{
...
...
spec/javascripts/notes/components/
issue_
note_body_spec.js
→
spec/javascripts/notes/components/note_body_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
noteBody
from
'
~/notes/components/
issue_
note_body.vue
'
;
import
noteBody
from
'
~/notes/components/note_body.vue
'
;
import
{
noteableDataMock
,
notesDataMock
,
note
}
from
'
../mock_data
'
;
import
{
noteableDataMock
,
notesDataMock
,
note
}
from
'
../mock_data
'
;
describe
(
'
issue_note_body component
'
,
()
=>
{
describe
(
'
issue_note_body component
'
,
()
=>
{
...
...
spec/javascripts/notes/components/
issue_
note_form_spec.js
→
spec/javascripts/notes/components/note_form_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
issueNoteForm
from
'
~/notes/components/
issue_
note_form.vue
'
;
import
issueNoteForm
from
'
~/notes/components/note_form.vue
'
;
import
{
noteableDataMock
,
notesDataMock
}
from
'
../mock_data
'
;
import
{
noteableDataMock
,
notesDataMock
}
from
'
../mock_data
'
;
import
{
keyboardDownEvent
}
from
'
../../issue_show/helpers
'
;
import
{
keyboardDownEvent
}
from
'
../../issue_show/helpers
'
;
...
...
spec/javascripts/notes/components/
issu
e_discussion_spec.js
→
spec/javascripts/notes/components/
noteabl
e_discussion_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
issueDiscussion
from
'
~/notes/components/
issu
e_discussion.vue
'
;
import
issueDiscussion
from
'
~/notes/components/
noteabl
e_discussion.vue
'
;
import
{
noteableDataMock
,
discussionMock
,
notesDataMock
}
from
'
../mock_data
'
;
import
{
noteableDataMock
,
discussionMock
,
notesDataMock
}
from
'
../mock_data
'
;
describe
(
'
issue_discussion component
'
,
()
=>
{
describe
(
'
issue_discussion component
'
,
()
=>
{
...
@@ -30,7 +30,7 @@ describe('issue_discussion component', () => {
...
@@ -30,7 +30,7 @@ describe('issue_discussion component', () => {
it
(
'
should render discussion header
'
,
()
=>
{
it
(
'
should render discussion header
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.discussion-header
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.discussion-header
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
All
(
'
.notes li
'
)
.
length
).
toEqual
(
discussionMock
.
notes
.
length
);
expect
(
vm
.
$el
.
querySelector
(
'
.notes
'
).
children
.
length
).
toEqual
(
discussionMock
.
notes
.
length
);
});
});
describe
(
'
actions
'
,
()
=>
{
describe
(
'
actions
'
,
()
=>
{
...
...
spec/javascripts/notes/components/
issu
e_note_spec.js
→
spec/javascripts/notes/components/
noteabl
e_note_spec.js
View file @
874deb41
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/notes/stores
'
;
import
store
from
'
~/notes/stores
'
;
import
issueNote
from
'
~/notes/components/
issu
e_note.vue
'
;
import
issueNote
from
'
~/notes/components/
noteabl
e_note.vue
'
;
import
{
noteableDataMock
,
notesDataMock
,
note
}
from
'
../mock_data
'
;
import
{
noteableDataMock
,
notesDataMock
,
note
}
from
'
../mock_data
'
;
describe
(
'
issue_note
'
,
()
=>
{
describe
(
'
issue_note
'
,
()
=>
{
...
...
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