diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-12 21:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-12 21:09:34 +0300 |
commit | 949ed51c6d20ba24e1f508cae9a65b86114bff62 (patch) | |
tree | 9308fe87e6d61b35eb3b2d101c47e89b9054655f /app/assets/javascripts/notes | |
parent | c0b17cee8be646588b14db49ad6d91b8cc818f97 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/notes/mixins/discussion_navigation.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index b80262622eb..865b3d1a057 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -293,6 +293,7 @@ export default { <div class="timeline-content"> <div :data-discussion-id="discussion.id" + :data-discussion-resolvable="discussion.resolvable" :data-discussion-resolved="discussion.resolved" class="discussion js-discussion-container" data-qa-selector="discussion_content" diff --git a/app/assets/javascripts/notes/mixins/discussion_navigation.js b/app/assets/javascripts/notes/mixins/discussion_navigation.js index 90de7db8c1b..8e69f1ddc88 100644 --- a/app/assets/javascripts/notes/mixins/discussion_navigation.js +++ b/app/assets/javascripts/notes/mixins/discussion_navigation.js @@ -9,7 +9,7 @@ function getAllDiscussionElements() { const containerEl = isOverviewPage() ? '.tab-pane.notes' : '.diffs'; return Array.from( document.querySelectorAll( - `${containerEl} div[data-discussion-id]:not([data-discussion-resolved])`, + `${containerEl} div[data-discussion-id][data-discussion-resolvable]:not([data-discussion-resolved])`, ), ); } |