Commit d58a1049 authored by Thomas Randolph's avatar Thomas Randolph

Remove the "local file reviews" feature flag

Changelog: other
parent ce159014
...@@ -170,10 +170,7 @@ export default { ...@@ -170,10 +170,7 @@ export default {
return !this.isCollapsed && !this.isFileTooLarge; return !this.isCollapsed && !this.isFileTooLarge;
}, },
showLocalFileReviews() { showLocalFileReviews() {
const loggedIn = Boolean(gon.current_user_id); return Boolean(gon.current_user_id);
const featureOn = this.glFeatures.localFileReviews;
return loggedIn && featureOn;
}, },
codequalityDiffForFile() { codequalityDiffForFile() {
return this.codequalityDiff?.files?.[this.file.file_path] || []; return this.codequalityDiff?.files?.[this.file.file_path] || [];
......
...@@ -35,7 +35,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -35,7 +35,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:merge_request_widget_graphql, @project, default_enabled: :yaml) push_frontend_feature_flag(:merge_request_widget_graphql, @project, default_enabled: :yaml)
push_frontend_feature_flag(:default_merge_ref_for_diffs, @project, default_enabled: :yaml) push_frontend_feature_flag(:default_merge_ref_for_diffs, @project, default_enabled: :yaml)
push_frontend_feature_flag(:core_security_mr_widget_counts, @project) push_frontend_feature_flag(:core_security_mr_widget_counts, @project)
push_frontend_feature_flag(:local_file_reviews, default_enabled: :yaml)
push_frontend_feature_flag(:paginated_notes, @project, default_enabled: :yaml) push_frontend_feature_flag(:paginated_notes, @project, default_enabled: :yaml)
push_frontend_feature_flag(:confidential_notes, @project, default_enabled: :yaml) push_frontend_feature_flag(:confidential_notes, @project, default_enabled: :yaml)
push_frontend_feature_flag(:usage_data_i_testing_summary_widget_total, @project, default_enabled: :yaml) push_frontend_feature_flag(:usage_data_i_testing_summary_widget_total, @project, default_enabled: :yaml)
......
---
name: local_file_reviews
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296674
milestone: '13.9'
type: development
group: group::code review
default_enabled: true
...@@ -97,11 +97,8 @@ a merge request. You can choose to hide or show whitespace changes: ...@@ -97,11 +97,8 @@ a merge request. You can choose to hide or show whitespace changes:
## Mark files as viewed ## Mark files as viewed
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513) in GitLab 13.9. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513) in GitLab 13.9 behind a feature flag, enabled by default.
> - Deployed behind a feature flag, enabled by default. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/296674) in GitLab 14.3.
> - Enabled on GitLab.com.
> - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-file-views). **(FREE SELF)**
When reviewing a merge request with many files multiple times, it may be useful to the reviewer When reviewing a merge request with many files multiple times, it may be useful to the reviewer
to focus on new changes and ignore the files that they have already reviewed and don't want to to focus on new changes and ignore the files that they have already reviewed and don't want to
...@@ -116,25 +113,6 @@ To mark a file as viewed: ...@@ -116,25 +113,6 @@ To mark a file as viewed:
Once checked, the file remains marked for that reviewer unless there are newly introduced Once checked, the file remains marked for that reviewer unless there are newly introduced
changes to its content or the checkbox is unchecked. changes to its content or the checkbox is unchecked.
### Enable or disable file views **(FREE SELF)**
The file view feature is under development but ready for production use.
It is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
can opt to enable it for your instance.
To enable it:
```ruby
Feature.enable(:local_file_reviews)
```
To disable it:
```ruby
Feature.disable(:local_file_reviews)
```
## Show merge request conflicts in diff ## Show merge request conflicts in diff
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5.
......
...@@ -242,32 +242,20 @@ describe('DiffFile', () => { ...@@ -242,32 +242,20 @@ describe('DiffFile', () => {
}); });
it.each` it.each`
loggedIn | featureOn | bool loggedIn | bool
${true} | ${true} | ${true} ${true} | ${true}
${false} | ${true} | ${false} ${false} | ${false}
${true} | ${false} | ${false} `('should be $bool when { userIsLoggedIn: $loggedIn }', ({ loggedIn, bool }) => {
${false} | ${false} | ${false} setLoggedIn(loggedIn);
`(
'should be $bool when { userIsLoggedIn: $loggedIn, featureEnabled: $featureOn }', ({ wrapper } = createComponent({
({ loggedIn, featureOn, bool }) => { props: {
setLoggedIn(loggedIn); file: store.state.diffs.diffFiles[0],
},
({ wrapper } = createComponent({ }));
options: {
provide: {
glFeatures: {
localFileReviews: featureOn,
},
},
},
props: {
file: store.state.diffs.diffFiles[0],
},
}));
expect(wrapper.vm.showLocalFileReviews).toBe(bool); expect(wrapper.vm.showLocalFileReviews).toBe(bool);
}, });
);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment