Download as
Browse Code »

Commit 5a4386a466425422fc20c255e8a310eff0380f6b

Authored by Dmitriy Zaporozhets
1 parent 405694a5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Render valid message when MR source or target branch was removed 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 16 additions and 1 deletions   Show diff stats
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @5a4386a
... ... @@ -2,7 +2,10 @@
2 2 = render "projects/merge_requests/show/mr_title"
3 3 = render "projects/merge_requests/show/how_to_merge"
4 4 = render "projects/merge_requests/show/mr_box"
5   - = render "projects/merge_requests/show/mr_accept"
  5 + - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists?
  6 + = render "projects/merge_requests/show/mr_accept"
  7 + - else
  8 + = render "projects/merge_requests/show/no_accept"
6 9 - if @merge_request.source_project.gitlab_ci?
7 10 = render "projects/merge_requests/show/mr_ci"
8 11 = render "projects/merge_requests/show/commits"
... ...
app/views/projects/merge_requests/show/_no_accept.html.haml 0 → 100644
  Diff comments   View file @5a4386a
... ... @@ -0,0 +1,12 @@
  1 +.alert.alert-error
  2 + %p
  3 + This merge request can not be accepted because branch
  4 + - unless @merge_request.source_branch_exists?
  5 + %span.label.label-inverse= @merge_request.source_branch
  6 + does not exist in
  7 + %span.label.label-info= @merge_request.source_project_path
  8 + - else
  9 + %span.label.label-inverse= @merge_request.target_branch
  10 + does not exist in
  11 + %span.label.label-info= @merge_request.target_project_path
  12 + %strong Please close this merge request or change branches with existing one
... ...