diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 13:27:32 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 13:27:32 +0000 |
| commit | d4d522b683a9f31cc4e0715d943eae30118293d2 (patch) | |
| tree | 31b58d0841a668174b803337a9d5005bbb64ff77 /app/views/projects/merge_requests/widget/_open.html.haml | |
| parent | b1b5060dbad15975184ec20a1914c7c48fc804db (diff) | |
| download | gitlab-ce-revert-7a5e653f.tar.gz | |
Revert "Merge branch 'hide-empty-merge-request-diffs' into 'master'"revert-7a5e653f
This reverts merge request !7568
Diffstat (limited to 'app/views/projects/merge_requests/widget/_open.html.haml')
| -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 20c93930abc..ac26aa569ba 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.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.branch_missing? + = render 'projects/merge_requests/widget/open/missing_branch' - elsif @merge_request.unchecked? = render 'projects/merge_requests/widget/open/check' - elsif @merge_request.cannot_be_merged? && !resolved_conflicts |