diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-12 16:20:32 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-12 16:20:32 +0000 |
| commit | 8ade1f8758efa687e67c0c29e8d67217c31c9e0f (patch) | |
| tree | 1c4849cf88a498c5854d6dc849f1ebbfcf42d890 | |
| parent | eabd1b9e6ad53b3b8e01e64a1425ad7c87b6361b (diff) | |
| parent | 701876cb3bedc760b7789b55c6f11366bd795589 (diff) | |
| download | gitlab-ce-8ade1f8758efa687e67c0c29e8d67217c31c9e0f.tar.gz | |
Merge branch 'fix-diverged-branch-locals' into 'master'
Fix diverged branch locals
See merge request gitlab-org/gitlab-ce!29508
| -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 |