Fix diverged branch locals

701876cb · Luke Bennett · 9bf141cf · 701876cb · 701876cb
Commit 701876cb authored Jun 11, 2019 by Luke Bennett
Showing with 6 additions and 1 deletion

app/views/projects/branches/_branch.html.haml app/views/projects/branches/_branch.html.haml +1 -1

changelogs/unreleased/fix-diverged-branch-locals.yml changelogs/unreleased/fix-diverged-branch-locals.yml +5 -0

No files found.
--- 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