Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d58a1049
Commit
d58a1049
authored
Aug 23, 2021
by
Thomas Randolph
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the "local file reviews" feature flag
Changelog: other
parent
ce159014
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
62 deletions
+16
-62
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+1
-4
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
config/feature_flags/development/local_file_reviews.yml
config/feature_flags/development/local_file_reviews.yml
+0
-8
doc/user/project/merge_requests/changes.md
doc/user/project/merge_requests/changes.md
+2
-24
spec/frontend/diffs/components/diff_file_spec.js
spec/frontend/diffs/components/diff_file_spec.js
+13
-25
No files found.
app/assets/javascripts/diffs/components/diff_file.vue
View file @
d58a1049
...
...
@@ -170,10 +170,7 @@ export default {
return
!
this
.
isCollapsed
&&
!
this
.
isFileTooLarge
;
},
showLocalFileReviews
()
{
const
loggedIn
=
Boolean
(
gon
.
current_user_id
);
const
featureOn
=
this
.
glFeatures
.
localFileReviews
;
return
loggedIn
&&
featureOn
;
return
Boolean
(
gon
.
current_user_id
);
},
codequalityDiffForFile
()
{
return
this
.
codequalityDiff
?.
files
?.[
this
.
file
.
file_path
]
||
[];
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
d58a1049
...
...
@@ -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
(
:default_merge_ref_for_diffs
,
@project
,
default_enabled: :yaml
)
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
(
:confidential_notes
,
@project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:usage_data_i_testing_summary_widget_total
,
@project
,
default_enabled: :yaml
)
...
...
config/feature_flags/development/local_file_reviews.yml
deleted
100644 → 0
View file @
ce159014
---
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
doc/user/project/merge_requests/changes.md
View file @
d58a1049
...
...
@@ -97,11 +97,8 @@ a merge request. You can choose to hide or show whitespace changes:
## Mark files as viewed
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513) in GitLab 13.9.
> - Deployed behind a feature flag, enabled by default.
> - 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)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513) in GitLab 13.9 behind a feature flag, enabled by default.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/296674) in GitLab 14.3.
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
...
...
@@ -116,25 +113,6 @@ To mark a file as viewed:
Once checked, the file remains marked for that reviewer unless there are newly introduced
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
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5.
...
...
spec/frontend/diffs/components/diff_file_spec.js
View file @
d58a1049
...
...
@@ -242,32 +242,20 @@ describe('DiffFile', () => {
});
it
.
each
`
loggedIn | featureOn | bool
${
true
}
|
${
true
}
|
${
true
}
${
false
}
|
${
true
}
|
${
false
}
${
true
}
|
${
false
}
|
${
false
}
${
false
}
|
${
false
}
|
${
false
}
`
(
'
should be $bool when { userIsLoggedIn: $loggedIn, featureEnabled: $featureOn }
'
,
({
loggedIn
,
featureOn
,
bool
})
=>
{
setLoggedIn
(
loggedIn
);
({
wrapper
}
=
createComponent
({
options
:
{
provide
:
{
glFeatures
:
{
localFileReviews
:
featureOn
,
},
},
},
props
:
{
file
:
store
.
state
.
diffs
.
diffFiles
[
0
],
},
}));
loggedIn | bool
${
true
}
|
${
true
}
${
false
}
|
${
false
}
`
(
'
should be $bool when { userIsLoggedIn: $loggedIn }
'
,
({
loggedIn
,
bool
})
=>
{
setLoggedIn
(
loggedIn
);
({
wrapper
}
=
createComponent
({
props
:
{
file
:
store
.
state
.
diffs
.
diffFiles
[
0
],
},
}));
expect
(
wrapper
.
vm
.
showLocalFileReviews
).
toBe
(
bool
);
},
);
expect
(
wrapper
.
vm
.
showLocalFileReviews
).
toBe
(
bool
);
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment