From 701876cb3bedc760b7789b55c6f11366bd795589 Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Tue, 11 Jun 2019 20:12:11 +0000 Subject: [PATCH] Fix diverged branch locals --- app/views/projects/branches/_branch.html.haml | 2 +- changelogs/unreleased/fix-diverged-branch-locals.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/fix-diverged-branch-locals.yml diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 1074cd6bf4e..a5eaae2dff4 100644 --- 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 diff --git a/changelogs/unreleased/fix-diverged-branch-locals.yml b/changelogs/unreleased/fix-diverged-branch-locals.yml new file mode 100644 index 00000000000..719d669fad3 --- /dev/null +++ b/changelogs/unreleased/fix-diverged-branch-locals.yml @@ -0,0 +1,5 @@ +--- +title: Fix diverged branch locals +merge_request: 29508 +author: +type: fixed