Commit 5bd6b44d authored by Mark Chao's avatar Mark Chao

Refactor find rule

Do no force a find by the name
parent a818d996
...@@ -130,9 +130,8 @@ module Gitlab ...@@ -130,9 +130,8 @@ module Gitlab
return return
end end
rule = find_or_create_rule rule = first_or_initialize
rule.user_ids = target.approver_ids rule.update(user_ids: target.approver_ids, group_ids: target.approver_group_ids)
rule.group_ids = target.approver_group_ids
rule rule
end end
...@@ -147,10 +146,11 @@ module Gitlab ...@@ -147,10 +146,11 @@ module Gitlab
end end
end end
def find_or_create_rule def first_or_initialize
rule = target.approval_rules.regular.find_or_initialize_by(name: ApprovalRuleLike::DEFAULT_NAME) rule = target.approval_rules.regular.first_or_initialize
unless rule.persisted? unless rule.persisted?
rule.name ||= ApprovalRuleLike::DEFAULT_NAME
rule.approvals_required = target.approvals_before_merge || 0 rule.approvals_required = target.approvals_before_merge || 0
rule.save! rule.save!
end end
......
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