Commit 58c76605 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'update-mr-branch-text' into 'master'

Update merge request text to reflect editability of source/target branch

Screenshot 1 (source branch deleted):

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png)

Screenshot 2 (target branch deleted):

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/acec96c12d40175301ce4d4405137348/image.png)

Closes #2134

See merge request !1085
parents 8ec7025a 8221236d
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
%span.label.label-inverse= @merge_request.source_branch %span.label.label-inverse= @merge_request.source_branch
does not exist in does not exist in
%span.label.label-info= @merge_request.source_project_path %span.label.label-info= @merge_request.source_project_path
%br
%strong Please close this merge request and open a new merge request to change source branches.
- else - else
%span.label.label-inverse= @merge_request.target_branch %span.label.label-inverse= @merge_request.target_branch
does not exist in does not exist in
%span.label.label-info= @merge_request.target_project_path %span.label.label-info= @merge_request.target_project_path
%br %br
%strong Please close this merge request or change branches with existing one %strong Please close this merge request or change to another target branch.
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