Resolve CE/EE diffs in projects branches

Part of single codebase changes.
2019-05-21 03:10:46 +01:00 · 2019-05-21 03:10:46 +01:00 · 10b9604a0e
parent 01a28eada1
commit 10b9604a0e
1 changed files with 2 additions and 0 deletions
--- 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