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
This commit is contained in:
commit
58c76605b3
|
@ -6,9 +6,11 @@
|
|||
%span.label.label-inverse= @merge_request.source_branch
|
||||
does not exist in
|
||||
%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
|
||||
%span.label.label-inverse= @merge_request.target_branch
|
||||
does not exist in
|
||||
%span.label.label-info= @merge_request.target_project_path
|
||||
%br
|
||||
%strong Please close this merge request or change branches with existing one
|
||||
%br
|
||||
%strong Please close this merge request or change to another target branch.
|
||||
|
|
Loading…
Reference in New Issue