Commit 977146f5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Prevent creating several open merge requests for same branches

parent b4e8fea2
...@@ -91,6 +91,10 @@ class MergeRequest < ActiveRecord::Base ...@@ -91,6 +91,10 @@ class MergeRequest < ActiveRecord::Base
if target_branch == source_branch if target_branch == source_branch
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?
errors.add :base, "There is already an open merge request for this branches"
end
end end
def reload_code def reload_code
......
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