home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Douwe Maan
2015-08-04 09:01:54 +00:00
parent 8ec7025a5d 8221236df1
commit 58c76605b3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
+4 -2
View File
@@ -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.