Skip to content

Commit 940c050

Browse files
committed
Check for existing MR only for opened/reopened MR
1 parent e7c930a commit 940c050

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

app/models/merge_request.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ def validate_branches
9292
errors.add :branch_conflict, "You can not use same branch for source and target branches"
9393
end
9494

95-
similar_mrs = self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened
96-
similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
95+
if opened? || reopened?
96+
similar_mrs = self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened
97+
similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
9798

98-
if similar_mrs.any?
99-
errors.add :base, "There is already an open merge request for this branches"
99+
if similar_mrs.any?
100+
errors.add :base, "There is already an open merge request for this branches"
101+
end
100102
end
101103
end
102104

0 commit comments

Comments
 (0)