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
c22280c0
Commit
c22280c0
authored
Oct 16, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable merge_request_reviewers FF
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/245190
parent
70172e2b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
config/feature_flags/development/merge_request_reviewers.yml
config/feature_flags/development/merge_request_reviewers.yml
+1
-1
No files found.
app/models/merge_request.rb
View file @
c22280c0
...
@@ -1695,7 +1695,7 @@ class MergeRequest < ApplicationRecord
...
@@ -1695,7 +1695,7 @@ class MergeRequest < ApplicationRecord
end
end
def
allows_reviewers?
def
allows_reviewers?
Feature
.
enabled?
(
:merge_request_reviewers
,
project
)
Feature
.
enabled?
(
:merge_request_reviewers
,
project
,
default_enabled:
true
)
end
end
def
allows_multiple_reviewers?
def
allows_multiple_reviewers?
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
c22280c0
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
-
if
merge_request
.
assignees
.
any?
-
if
merge_request
.
assignees
.
any?
%li
.gl-display-flex.gl-align-items-center
%li
.gl-display-flex.gl-align-items-center
=
render
'shared/issuable/assignees'
,
project:
merge_request
.
project
,
issuable:
merge_request
=
render
'shared/issuable/assignees'
,
project:
merge_request
.
project
,
issuable:
merge_request
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
)
&&
merge_request
.
reviewers
.
any?
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
,
default_enabled:
true
)
&&
merge_request
.
reviewers
.
any?
%li
.gl-display-flex.issuable-reviewers
%li
.gl-display-flex.issuable-reviewers
=
render
'shared/issuable/reviewers'
,
project:
merge_request
.
project
,
issuable:
merge_request
=
render
'shared/issuable/reviewers'
,
project:
merge_request
.
project
,
issuable:
merge_request
=
render
'projects/merge_requests/approvals_count'
,
merge_request:
merge_request
=
render
'projects/merge_requests/approvals_count'
,
merge_request:
merge_request
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
c22280c0
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
.block.assignee.qa-assignee-block
.block.assignee.qa-assignee-block
=
render
"shared/issuable/sidebar_assignees"
,
issuable_sidebar:
issuable_sidebar
,
assignees:
assignees
,
signed_in:
signed_in
=
render
"shared/issuable/sidebar_assignees"
,
issuable_sidebar:
issuable_sidebar
,
assignees:
assignees
,
signed_in:
signed_in
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
)
&&
reviewers
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
,
default_enabled:
true
)
&&
reviewers
.block.reviewer.qa-reviewer-block
.block.reviewer.qa-reviewer-block
=
render
"shared/issuable/sidebar_reviewers"
,
issuable_sidebar:
issuable_sidebar
,
reviewers:
reviewers
,
signed_in:
signed_in
=
render
"shared/issuable/sidebar_reviewers"
,
issuable_sidebar:
issuable_sidebar
,
reviewers:
reviewers
,
signed_in:
signed_in
...
...
config/feature_flags/development/merge_request_reviewers.yml
View file @
c22280c0
...
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488
...
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/245190
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/245190
group
:
group::source code
group
:
group::source code
type
:
development
type
:
development
default_enabled
:
fals
e
default_enabled
:
tru
e
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