diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-21 17:16:57 +0300 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-21 20:13:53 +0300 |
| commit | 6bfa3c93ed49d65783de824e4e99fec79adedf4e (patch) | |
| tree | 9839dee4feabf56505ebea4687bb6b4a1b77154d /app/views/projects/merge_requests | |
| parent | e22514fd4c54ec05e3272afdba5cba27d5b70516 (diff) | |
Warn that branch does not exist instead of saying that there is
nothing to merge in merge request page
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 01314eb37d0..eda6938bf21 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -9,10 +9,10 @@ - if @project.archived? = render 'projects/merge_requests/widget/open/archived' - - elsif @merge_request.commits.blank? - = render 'projects/merge_requests/widget/open/nothing' - elsif @merge_request.branch_missing? = render 'projects/merge_requests/widget/open/missing_branch' + - elsif @merge_request.commits.blank? + = render 'projects/merge_requests/widget/open/nothing' - elsif @merge_request.unchecked? = render 'projects/merge_requests/widget/open/check' - elsif @merge_request.cannot_be_merged? && !resolved_conflicts |