Add latest changes from gitlab-org/gitlab@master

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;