diff options
| author | Drew Blessing <drew.blessing@me.com> | 2014-12-26 15:24:21 -0600 |
|---|---|---|
| committer | Drew Blessing <drew.blessing@me.com> | 2014-12-26 15:54:12 -0600 |
| commit | aacf07467c1a30b349b8fa1d0155e8c95418bafe (patch) | |
| tree | d721a4ea363c5da25432608f80413140dd9565c3 /app/services/merge_requests | |
| parent | a7b7a2dd4c866403ec5536f213df9e4762fa112b (diff) | |
| download | gitlab-ce-aacf07467c1a30b349b8fa1d0155e8c95418bafe.tar.gz | |
Merge request error display.
Fixes #8432
Diffstat (limited to 'app/services/merge_requests')
| -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 |