diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-06 10:07:10 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-06 10:07:10 -0800 |
commit | b72f22ee15967684226c596625a01b17f6d806ab (patch) | |
tree | f77ac383026422faa967f0627cfa7106d2ac54bd /app | |
parent | c4700725239af627dec1340ea9ec834f7076eea8 (diff) | |
parent | aacf07467c1a30b349b8fa1d0155e8c95418bafe (diff) | |
download | gitlab-ce-b72f22ee15967684226c596625a01b17f6d806ab.tar.gz |
Merge pull request #8495 from dblessing/fix_8432
Merge request error display
Diffstat (limited to 'app')
-rw-r--r-- | app/services/merge_requests/build_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 1475973e543..859c3f56b2b 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -13,7 +13,7 @@ module MergeRequests merge_request.target_branch ||= merge_request.target_project.default_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 # Generate suggested MR title based on source branch name @@ -59,7 +59,7 @@ module MergeRequests end 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.can_be_created = false merge_request |