diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-02 22:36:34 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-03 07:11:04 -0700 |
| commit | 8221236df1acd1d38f36e79f248bc4fff3474839 (patch) | |
| tree | ae559a1df351a32d29eed4050adbf5c376bd95d7 /app | |
| parent | b8433cb886abfdc7eae86c1789c0f1c5ff56204d (diff) | |
| download | gitlab-ce-8221236df1acd1d38f36e79f248bc4fff3474839.tar.gz | |
Update merge request text to reflect editability of source/target branch
Closes #2134
Diffstat (limited to 'app')
| -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. |