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
29c0d80e
Commit
29c0d80e
authored
Jun 12, 2019
by
Lucas Charles
Committed by
Dmitriy Zaporozhets
Jun 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Link code_owner deprecation issue in MR approval rules
parent
09a050bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
ee/app/models/approval_merge_request_rule.rb
ee/app/models/approval_merge_request_rule.rb
+4
-0
No files found.
ee/app/models/approval_merge_request_rule.rb
View file @
29c0d80e
...
...
@@ -11,6 +11,7 @@ class ApprovalMergeRequestRule < ApplicationRecord
validates
:name
,
uniqueness:
{
scope:
[
:merge_request
,
:code_owner
]
}
# Temporary validations until `code_owner` can be dropped in favor of `rule_type`
# To be removed with https://gitlab.com/gitlab-org/gitlab-ee/issues/11834
validates
:code_owner
,
inclusion:
{
in:
[
true
],
if: :code_owner?
}
validates
:code_owner
,
inclusion:
{
in:
[
false
],
if: :regular?
}
...
...
@@ -30,6 +31,7 @@ class ApprovalMergeRequestRule < ApplicationRecord
}
# Deprecated scope until code_owner column has been migrated to rule_type
# To be removed with https://gitlab.com/gitlab-org/gitlab-ee/issues/11834
scope
:code_owner
,
->
{
where
(
code_owner:
true
).
or
(
where
(
rule_type: :code_owner
))
}
def
self
.
find_or_create_code_owner_rule
(
merge_request
,
pattern
)
...
...
@@ -47,12 +49,14 @@ class ApprovalMergeRequestRule < ApplicationRecord
# ApprovalRuleLike interface
# Temporary override to handle legacy records that have not yet been migrated
# To be removed with https://gitlab.com/gitlab-org/gitlab-ee/issues/11834
def
regular?
read_attribute
(
:rule_type
)
==
'regular'
||
code_owner
==
false
end
alias_method
:regular
,
:regular?
# Temporary override to handle legacy records that have not yet been migrated
# To be removed with https://gitlab.com/gitlab-org/gitlab-ee/issues/11834
def
code_owner?
read_attribute
(
:rule_type
)
==
'code_owner'
||
code_owner
end
...
...
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