Commit a59fe739 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

IMprove MR validation logic

parent 977146f5
...@@ -92,7 +92,10 @@ class MergeRequest < ActiveRecord::Base ...@@ -92,7 +92,10 @@ class MergeRequest < ActiveRecord::Base
errors.add :branch_conflict, "You can not use same branch for source and target branches" errors.add :branch_conflict, "You can not use same branch for source and target branches"
end end
if self.project.merge_requests.where(source_branch: source_branch, target_branch: target_branch).opened.any? 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" errors.add :base, "There is already an open merge request for this branches"
end end
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