home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity

IMprove MR validation logic

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-06-14 15:17:47 +03:00
parent 977146f568
commit a59fe739fe
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/merge_request.rb
+4 -1
View File
@@ -92,7 +92,10 @@ class MergeRequest < ActiveRecord::Base
errors.add :branch_conflict, "You can not use same branch for source and target branches"
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"
end
end