diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-28 15:08:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-28 15:08:02 +0300 |
commit | 5573dc288d880386a96afc9458f7d1abd6cd745f (patch) | |
tree | fb3ec81501f337b71b10e35285e56654c9c9ab52 /app/assets/javascripts/notes | |
parent | 1e16ecd8e2fd4b23ee56519072d245d261ea2804 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r-- | app/assets/javascripts/notes/components/notes_activity_header.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/notes/stores/actions.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/app/assets/javascripts/notes/components/notes_activity_header.vue b/app/assets/javascripts/notes/components/notes_activity_header.vue index a91c825710d..4d1cda51ba9 100644 --- a/app/assets/javascripts/notes/components/notes_activity_header.vue +++ b/app/assets/javascripts/notes/components/notes_activity_header.vue @@ -56,7 +56,7 @@ export default { :loading="aiLoading" /> <timeline-toggle v-if="showTimelineViewToggle" /> - <mr-discussion-filter v-if="mrFilter && glFeatures.mrActivityFilters" /> + <mr-discussion-filter v-if="mrFilter" /> <discussion-filter v-else :filters="notesFilters" :selected-value="notesFilterValue" /> </div> </div> diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index 7eb01897296..4071218d100 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -95,10 +95,7 @@ export const fetchDiscussions = ( ? { params: { notes_filter: filter, persist_filter: persistFilter } } : null; - if ( - window.gon?.features?.mrActivityFilters && - getters.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE - ) { + if (getters.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE) { config = { params: { notes_filter: 0, persist_filter: false } }; } diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index c43430639ad..096e95a3dcd 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -52,10 +52,7 @@ export const discussions = (state, getters, rootState) => { let discussionsInState = clone(state.discussions); // NOTE: not testing bc will be removed when backend is finished. - if ( - state.noteableData.targetType === 'merge_request' && - window.gon?.features?.mrActivityFilters - ) { + if (state.noteableData.targetType === 'merge_request') { discussionsInState = discussionsInState.reduce((acc, discussion) => { if (hideActivity(state.mergeRequestFilters, discussion)) { return acc; |