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

Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
2019-06-12 16:20:32 +00:00 · 2019-06-12 16:20:32 +00:00 · 8ade1f8758
parent eabd1b9e6a 701876cb3b
commit 8ade1f8758
2 changed files with 6 additions and 1 deletions
--- 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
@ -0,0 +1,5 @@
+---
+title: Fix diverged branch locals
+merge_request: 29508
+author:
+type: fixed