Merge branch 'project-branches-scb' into 'master'

Resolve CE/EE diffs in projects branches

Closes gitlab-ee#10498

See merge request gitlab-org/gitlab-ce!28521

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