From 977146f568794b56d955efd4b7df8ecaf9c97599 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Jun 2013 15:03:22 +0300 Subject: [PATCH] Prevent creating several open merge requests for same branches --- app/models/merge_request.rb | 4 ++++ 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b2ad1b7..13f55a8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -91,6 +91,10 @@ class MergeRequest < ActiveRecord::Base if target_branch == source_branch 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? + errors.add :base, "There is already an open merge request for this branches" + end end def reload_code -- libgit2 0.21.2