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
aeec5fa3
Commit
aeec5fa3
authored
Jan 25, 2021
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated batch comments
Fixed resolved thread count not showing
parent
2b2220eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
...s/batch_comments/stores/modules/batch_comments/actions.js
+17
-7
app/assets/javascripts/notes/components/notes_app.vue
app/assets/javascripts/notes/components/notes_app.vue
+2
-0
No files found.
app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
View file @
aeec5fa3
...
...
@@ -67,13 +67,23 @@ export const publishReview = ({ commit, dispatch, getters }) => {
.
catch
(()
=>
commit
(
types
.
RECEIVE_PUBLISH_REVIEW_ERROR
));
};
export
const
updateDiscussionsAfterPublish
=
({
dispatch
,
getters
,
rootGetters
})
=>
dispatch
(
'
fetchDiscussions
'
,
{
path
:
getters
.
getNotesData
.
discussionsPath
},
{
root
:
true
}).
then
(
()
=>
dispatch
(
'
diffs/assignDiscussionsToDiff
'
,
rootGetters
.
discussionsStructuredByLineCode
,
{
root
:
true
,
}),
);
export
const
updateDiscussionsAfterPublish
=
async
({
dispatch
,
getters
,
rootGetters
})
=>
{
if
(
window
.
gon
?.
features
?.
paginatedNotes
)
{
await
dispatch
(
'
stopPolling
'
,
null
,
{
root
:
true
});
await
dispatch
(
'
fetchData
'
,
null
,
{
root
:
true
});
await
dispatch
(
'
restartPolling
'
,
null
,
{
root
:
true
});
}
else
{
await
dispatch
(
'
fetchDiscussions
'
,
{
path
:
getters
.
getNotesData
.
discussionsPath
},
{
root
:
true
},
);
}
dispatch
(
'
diffs/assignDiscussionsToDiff
'
,
rootGetters
.
discussionsStructuredByLineCode
,
{
root
:
true
,
});
};
export
const
updateDraft
=
(
{
commit
,
getters
},
...
...
app/assets/javascripts/notes/components/notes_app.vue
View file @
aeec5fa3
...
...
@@ -108,6 +108,7 @@ export default {
async
isFetching
()
{
if
(
!
this
.
isFetching
)
{
await
this
.
$nextTick
();
await
this
.
updateResolvableDiscussionsCounts
();
await
this
.
startTaskList
();
await
this
.
checkLocationHash
();
}
...
...
@@ -179,6 +180,7 @@ export default {
'
convertToDiscussion
'
,
'
stopPolling
'
,
'
setConfidentiality
'
,
'
updateResolvableDiscussionsCounts
'
,
]),
discussionIsIndividualNoteAndNotConverted
(
discussion
)
{
return
discussion
.
individual_note
&&
!
this
.
convertedDisscussionIds
.
includes
(
discussion
.
id
);
...
...
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