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
61d0b7ff
Commit
61d0b7ff
authored
Jul 12, 2019
by
Igor
Committed by
Douwe Maan
Jul 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag behind MR's multiple assignees
parent
af1cedeb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
15 deletions
+6
-15
app/models/project.rb
app/models/project.rb
+0
-4
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+1
-2
ee/changelogs/unreleased/id-clean-up-mr-assignees.yml
ee/changelogs/unreleased/id-clean-up-mr-assignees.yml
+5
-0
ee/spec/models/merge_request_spec.rb
ee/spec/models/merge_request_spec.rb
+0
-9
No files found.
app/models/project.rb
View file @
61d0b7ff
...
...
@@ -690,10 +690,6 @@ class Project < ApplicationRecord
{
scope: :project
,
status:
auto_devops
&
.
enabled
||
Feature
.
enabled?
(
:force_autodevops_on_by_default
,
self
)
}
end
def
multiple_mr_assignees_enabled?
Feature
.
enabled?
(
:multiple_merge_request_assignees
,
self
)
end
def
daily_statistics_enabled?
Feature
.
enabled?
(
:project_daily_statistics
,
self
,
default_enabled:
true
)
end
...
...
ee/app/models/ee/merge_request.rb
View file @
61d0b7ff
...
...
@@ -76,8 +76,7 @@ module EE
end
def
allows_multiple_assignees?
project
.
multiple_mr_assignees_enabled?
&&
project
.
feature_available?
(
:multiple_merge_request_assignees
)
project
.
feature_available?
(
:multiple_merge_request_assignees
)
end
def
supports_weight?
...
...
ee/changelogs/unreleased/id-clean-up-mr-assignees.yml
0 → 100644
View file @
61d0b7ff
---
title
:
Remove feature flag behind MR's multiple assignees
merge_request
:
14506
author
:
type
:
changed
ee/spec/models/merge_request_spec.rb
View file @
61d0b7ff
...
...
@@ -48,15 +48,6 @@ describe MergeRequest do
expect
(
merge_request
.
allows_multiple_assignees?
).
to
be
(
true
)
end
it
'does not allows multiple assignees when licensed and feature flag is disabled'
do
stub_licensed_features
(
multiple_merge_request_assignees:
true
)
stub_feature_flags
(
multiple_merge_request_assignees:
false
)
merge_request
=
build
(
:merge_request
)
expect
(
merge_request
.
allows_multiple_assignees?
).
to
be
(
false
)
end
end
describe
'approval_rules'
do
...
...
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