Skip to content
Snippets Groups Projects
Commit b72f22ee authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge pull request #8495 from dblessing/fix_8432

Merge request error display
parents c4700725 aacf0746
No related branches found
No related tags found
No related merge requests found
Loading
@@ -13,7 +13,7 @@ module MergeRequests
Loading
@@ -13,7 +13,7 @@ module MergeRequests
merge_request.target_branch ||= merge_request.target_project.default_branch merge_request.target_branch ||= merge_request.target_project.default_branch
   
unless merge_request.target_branch && merge_request.source_branch unless merge_request.target_branch && merge_request.source_branch
return build_failed(merge_request, "You must select source and target branches") return build_failed(merge_request, nil)
end end
   
# Generate suggested MR title based on source branch name # Generate suggested MR title based on source branch name
Loading
@@ -59,7 +59,7 @@ module MergeRequests
Loading
@@ -59,7 +59,7 @@ module MergeRequests
end end
   
def build_failed(merge_request, message) def build_failed(merge_request, message)
merge_request.errors.add(:base, message) merge_request.errors.add(:base, message) unless message.nil?
merge_request.compare_commits = [] merge_request.compare_commits = []
merge_request.can_be_created = false merge_request.can_be_created = false
merge_request merge_request
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment