diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-04 12:01:54 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-04 12:01:54 +0300 |
| commit | 58c76605b31f56c8a2dff9381feae859bedb2076 (patch) | |
| tree | b41debb4fb9c642227097cec286030ddeb4c1f55 | |
| parent | 8ec7025a5d49548c1876440c1bd9b767828a5f56 (diff) | |
| parent | 8221236df1acd1d38f36e79f248bc4fff3474839 (diff) | |
Merge branch 'update-mr-branch-text' into 'master'
Update merge request text to reflect editability of source/target branch
Screenshot 1 (source branch deleted):
Screenshot 2 (target branch deleted):
Closes #2134
See merge request !1085
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_missing_branch.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml index 423fcd48e25..1c565bae80a 100644 --- a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml +++ b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml @@ -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. |