Commit 7901d143 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Proper erro message for MR when fork removed

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6c345997
...@@ -3,15 +3,21 @@ ...@@ -3,15 +3,21 @@
= render "projects/merge_requests/show/mr_box" = render "projects/merge_requests/show/mr_box"
.alert.alert-error .alert.alert-error
%h5
%i.icon-exclamation-sign
We cannot find
%span.label-branch= @merge_request.source_branch
or
%span.label-branch= @merge_request.target_branch
branches in the repository.
%p
Maybe it was removed or never pushed.
%p %p
We cannot render this merge request properly because
- if @merge_request.for_fork? && !@merge_request.source_project
fork project was removed
- elsif !@merge_request.source_branch_exists?
%span.label.label-inverse= @merge_request.source_branch
does not exist in
%span.label.label-info= @merge_request.source_project_path
- elsif !@merge_request.target_branch_exists?
%span.label.label-inverse= @merge_request.target_branch
does not exist in
%span.label.label-info= @merge_request.target_project_path
- else
of internal error
%strong
Please close Merge Request or change branches with existing one Please close Merge Request or change branches with existing one
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