Skip to content
Snippets Groups Projects
Commit 50b9a6e6 authored by Phil Hughes's avatar Phil Hughes
Browse files

Merge branch 'ph/removeMRActivityFiltersFlag' into 'master'

Remove the mr_activity_filters feature flag

See merge request gitlab-org/gitlab!132355



Merged-by: default avatarPhil Hughes <me@iamphill.com>
parents d00eac27 477a9f42
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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 } };
}
......
......@@ -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;
......
......@@ -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
......
---
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
......@@ -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.
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment