diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-06-11 20:12:11 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-06-12 01:57:40 +0100 |
| commit | 701876cb3bedc760b7789b55c6f11366bd795589 (patch) | |
| tree | 06f284f6d8e4ae258087bd28ed85371c828d1362 | |
| parent | 9bf141cf718ab9ca770c3bd6b7e2c6719cbe9da7 (diff) | |
| download | gitlab-ce-fix-diverged-branch-locals.tar.gz | |
Fix diverged branch localsfix-diverged-branch-locals
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-diverged-branch-locals.yml | 5 |
2 files changed, 6 insertions, 1 deletions
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 |