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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e9d1393e
Commit
e9d1393e
authored
Feb 26, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename initialDiscussion to firstNote in NoteableDiscussion
parent
a89df585
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+7
-7
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
e9d1393e
...
@@ -106,7 +106,7 @@ export default {
...
@@ -106,7 +106,7 @@ export default {
'
showJumpToNextDiscussion
'
,
'
showJumpToNextDiscussion
'
,
]),
]),
author
()
{
author
()
{
return
this
.
initialDiscussion
.
author
;
return
this
.
firstNote
.
author
;
},
},
canReply
()
{
canReply
()
{
return
this
.
getNoteableData
.
current_user
.
can_create_note
;
return
this
.
getNoteableData
.
current_user
.
can_create_note
;
...
@@ -117,7 +117,7 @@ export default {
...
@@ -117,7 +117,7 @@ export default {
hasReplies
()
{
hasReplies
()
{
return
this
.
discussion
.
notes
.
length
>
1
;
return
this
.
discussion
.
notes
.
length
>
1
;
},
},
initialDiscussion
()
{
firstNote
()
{
return
this
.
discussion
.
notes
.
slice
(
0
,
1
)[
0
];
return
this
.
discussion
.
notes
.
slice
(
0
,
1
)[
0
];
},
},
replies
()
{
replies
()
{
...
@@ -247,7 +247,7 @@ export default {
...
@@ -247,7 +247,7 @@ export default {
if
(
this
.
isReplying
)
{
if
(
this
.
isReplying
)
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
// Pass an extra key to separate reply and note edit forms
// Pass an extra key to separate reply and note edit forms
this
.
initAutoSave
({
...
this
.
initialDiscussion
,
...
this
.
discussion
},
[
'
Reply
'
]);
this
.
initAutoSave
({
...
this
.
firstNote
,
...
this
.
discussion
},
[
'
Reply
'
]);
});
});
}
else
{
}
else
{
this
.
disposeAutoSave
();
this
.
disposeAutoSave
();
...
@@ -390,8 +390,8 @@ Please check your network connection and try again.`;
...
@@ -390,8 +390,8 @@ Please check your network connection and try again.`;
<div
class=
"timeline-content"
>
<div
class=
"timeline-content"
>
<note-header
<note-header
:author=
"author"
:author=
"author"
:created-at=
"
initialDiscussion
.created_at"
:created-at=
"
firstNote
.created_at"
:note-id=
"
initialDiscussion
.id"
:note-id=
"
firstNote
.id"
:include-toggle=
"true"
:include-toggle=
"true"
:expanded=
"discussion.expanded"
:expanded=
"discussion.expanded"
@
toggleHandler=
"toggleDiscussionHandler"
@
toggleHandler=
"toggleDiscussionHandler"
...
@@ -424,8 +424,8 @@ Please check your network connection and try again.`;
...
@@ -424,8 +424,8 @@ Please check your network connection and try again.`;
<ul
class=
"notes"
>
<ul
class=
"notes"
>
<template
v-if=
"shouldGroupReplies"
>
<template
v-if=
"shouldGroupReplies"
>
<component
<component
:is=
"componentName(
initialDiscussion
)"
:is=
"componentName(
firstNote
)"
:note=
"componentData(
initialDiscussion
)"
:note=
"componentData(
firstNote
)"
:line=
"line"
:line=
"line"
:commit=
"commit"
:commit=
"commit"
:help-page-path=
"helpPagePath"
:help-page-path=
"helpPagePath"
...
...
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