diff --git a/app/assets/javascripts/notes/components/notes_activity_header.vue b/app/assets/javascripts/notes/components/notes_activity_header.vue
index a91c825710d13be16e7c645377ca84162932adc8..4d1cda51ba904acd084218a901034b1f6aef4e12 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"
/>
-
+
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 7eb018972966c405b0bad05922e226c77ad1fb2d..4071218d1007d5f4ba71864edf2dced5f4b6c3a6 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 c43430639ade995014860dfa65bd7a705a6bb54b..096e95a3dcd60de44c1b0ae0de1c8d65be3957dc 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;
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 53fd7256b192ca0ee35bdb7dca14997260d0a112..5cd5f8a1dcd52aeddeb4cea8bfad72c4a280cb2d 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -46,7 +46,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:mr_experience_survey, project)
push_frontend_feature_flag(:saved_replies, current_user)
push_force_frontend_feature_flag(:summarize_my_code_review, summarize_my_code_review_enabled?)
- push_frontend_feature_flag(:mr_activity_filters, current_user)
push_frontend_feature_flag(:ci_job_failures_in_mr, project)
push_frontend_feature_flag(:mr_pipelines_graphql, project)
end
diff --git a/config/feature_flags/development/mr_activity_filters.yml b/config/feature_flags/development/mr_activity_filters.yml
deleted file mode 100644
index ae3a193047b63a418adefdc9788d620c98490e3b..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/mr_activity_filters.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: mr_activity_filters
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115383
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412432
-milestone: '15.11'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index ed762979ff1931a4133900a62df5e30b980797a3..1af363a22392b343bee01a27d6ed6cbd28290fd0 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -302,12 +302,9 @@ For a web developer writing a webpage for your company's website:
## Filter activity in a merge request
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115383) in GitLab 15.11 [with a flag](../../../administration/feature_flags.md) named `mr_activity_filters`. Disabled by default.
-> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/387070) in GitLab 16.0. Available to GitLab team members only.
-
-FLAG:
-On self-managed GitLab, by default this feature is not available.
-To make it available per user, an administrator can [enable the feature flag](../../../administration/feature_flags.md) named `mr_activity_filters` for individual or groups of users.
-On GitLab.com, this feature is enabled for GitLab team members only.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/387070) in GitLab 16.0.
+> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126998) in GitLab 16.3 by default.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132355) in GitLab 16.5. Feature flag `mr_activity_filters` removed.
To understand the history of a merge request, filter its activity feed to show you
only the items that are relevant to you.
diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index 104c297b44e6502285d7a5a21f8122486ac3dfbb..f07ba1e032f1d54235bfcddf24dd8901a5ceed55 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -1343,8 +1343,6 @@ describe('Actions Notes Store', () => {
});
it('dispatches `fetchDiscussionsBatch` action with notes_filter 0 for merge request', () => {
- window.gon = { features: { mrActivityFilters: true } };
-
return testAction(
actions.fetchDiscussions,
{ path: 'test-path', filter: 'test-filter', persistFilter: 'test-persist-filter' },
@@ -1397,7 +1395,7 @@ describe('Actions Notes Store', () => {
type: 'fetchDiscussionsBatch',
payload: {
config: {
- params: { notes_filter: 'test-filter', persist_filter: 'test-persist-filter' },
+ params: { notes_filter: 0, persist_filter: false },
},
path: 'test-path',
perPage: 20,