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
91481002
Commit
91481002
authored
Aug 02, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Fix broken discussion reply
parent
60f6b596
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+2
-2
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+1
-1
app/assets/javascripts/notes/components/issue_notes_app.vue
app/assets/javascripts/notes/components/issue_notes_app.vue
+3
-2
No files found.
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
91481002
...
...
@@ -86,7 +86,7 @@
this
.
isReplying
=
false
;
},
saveReply
(
{
note
}
)
{
saveReply
(
note
)
{
const
replyData
=
{
endpoint
:
this
.
newNotePath
,
flashContainer
:
this
.
$el
,
...
...
@@ -94,7 +94,7 @@
in_reply_to_discussion_id
:
this
.
note
.
reply_id
,
target_type
:
'
issue
'
,
target_id
:
this
.
discussion
.
noteable_id
,
note
:
{
note
},
note
:
{
note
:
note
},
full_data
:
true
,
},
};
...
...
app/assets/javascripts/notes/components/issue_note_form.vue
View file @
91481002
...
...
@@ -49,7 +49,7 @@
},
methods
:
{
handleUpdate
()
{
this
.
$emit
(
'
handleFormUpdate
'
,
note
);
this
.
$emit
(
'
handleFormUpdate
'
,
this
.
note
);
},
editMyLastNote
()
{
if
(
this
.
note
===
''
)
{
...
...
app/assets/javascripts/notes/components/issue_notes_app.vue
View file @
91481002
...
...
@@ -61,7 +61,8 @@
setNotesData
:
'
setNotesData
'
,
setIssueData
:
'
setIssueData
'
,
setUserData
:
'
setUserData
'
,
setLastFetchedAt
:
'
setLastFetchedAt
'
setLastFetchedAt
:
'
setLastFetchedAt
'
,
setTargetNoteHash
:
'
setTargetNoteHash
'
,
}),
getComponentName
(
note
)
{
if
(
note
.
isPlaceholderNote
)
{
...
...
@@ -84,7 +85,7 @@
this
.
isLoading
=
false
;
// Scroll to note if we have hash fragment in the page URL
Vue
.
nextTick
(()
=>
{
this
.
$
nextTick
(()
=>
{
this
.
checkLocationHash
();
});
})
...
...
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