diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-05-21 03:10:46 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-21 03:10:46 +0100 |
| commit | 10b9604a0ec8d15713c3e02e17fe953b051fc97b (patch) | |
| tree | 6a82da91cee976ad83ee038c9cf7c627b4fe5f02 | |
| parent | 01a28eada1215fe9d97b16bb405a1f1eb52f4ee3 (diff) | |
| download | gitlab-ce-project-branches-scb.tar.gz | |
Resolve CE/EE diffs in projects branchesproject-branches-scb
Part of single codebase changes.
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 0e15f581ddc..1074cd6bf4e 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -22,6 +22,8 @@ %span.badge.badge-success.prepend-left-5 = s_('Branches|protected') + = render_if_exists 'projects/branches/diverged_from_upstream' + .block-truncated - if commit = render 'projects/branches/commit', commit: commit, project: @project |