Fix diverged branch locals

701876cb · Luke "Jared" Bennett · 9bf141cf · 701876cb · 701876cb
Unverified Commit 701876cb authored 5 years ago by Luke "Jared" Bennett
--- a/app/views/projects/branches/_branch.html.haml
+++ b/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

--- a/changelogs/unreleased/fix-diverged-branch-locals.yml
+++ b/changelogs/unreleased/fix-diverged-branch-locals.yml
+---
+title: Fix diverged branch locals
+merge_request: 29508
+author:
+type: fixed