From 10b9604a0ec8d15713c3e02e17fe953b051fc97b Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 21 May 2019 03:10:46 +0100 Subject: Resolve CE/EE diffs in projects branches Part of single codebase changes. --- app/views/projects/branches/_branch.html.haml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/views/projects/branches/_branch.html.haml') diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 0e15f581ddc..1074cd6bf4e 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -22,6 +22,8 @@ %span.badge.badge-success.prepend-left-5 = s_('Branches|protected') + = render_if_exists 'projects/branches/diverged_from_upstream' + .block-truncated - if commit = render 'projects/branches/commit', commit: commit, project: @project -- cgit v1.2.1