Merge branch 'fix-diverged-branch-locals' into 'master'

Fix diverged branch locals

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

(cherry picked from commit 8ade1f87)

701876cb Fix diverged branch locals

app/views/projects/branches/_branch.html.haml

@@ -22,7 +22,7 @@
         %span.badge.badge-success.prepend-left-5
           = s_('Branches|protected')
-      = render_if_exists 'projects/branches/diverged_from_upstream'
+      = render_if_exists 'projects/branches/diverged_from_upstream', branch: branch
     .block-truncated
       - if commit

changelogs/unreleased/fix-diverged-branch-locals.yml

+---
+title: Fix diverged branch locals
+merge_request: 29508
+author:
+type: fixed