提交 940c0508 编写于 作者: D Dmitriy Zaporozhets

Check for existing MR only for opened/reopened MR

上级 e7c930a5
......@@ -92,11 +92,13 @@ class MergeRequest < ActiveRecord::Base
errors.add :branch_conflict, "You can not use same branch for source and target branches"
end
similar_mrs = self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened
similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
if opened? || reopened?
similar_mrs = self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened
similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
if similar_mrs.any?
errors.add :base, "There is already an open merge request for this branches"
if similar_mrs.any?
errors.add :base, "There is already an open merge request for this branches"
end
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册