diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-21 14:56:21 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-21 14:56:21 +0300 |
| commit | 981d9ba95616e4af8bd72cb08bf8977886f4d325 (patch) | |
| tree | cbd6428af1b87ab5ec7fea198a46680fcdeb60e9 /app | |
| parent | 611ef0bcdd288023faad7e9ddbd34762164e0c3a (diff) | |
| parent | 10b9604a0ec8d15713c3e02e17fe953b051fc97b (diff) | |
Merge branch 'project-branches-scb' into 'master'
Resolve CE/EE diffs in projects branches
Closes gitlab-ee#10498
See merge request gitlab-org/gitlab-ce!28521
Diffstat (limited to 'app')
| -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 |