Resolve CE/EE diffs in projects branches

Part of single codebase changes.

Resolve CE/EE diffs in projects branches
Part of single codebase changes.
10b9604a · Luke Bennett · 01a28ead · 10b9604a
Commit 10b9604a authored May 21, 2019 by Luke Bennett
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/views/projects/branches/_branch.html.haml app/views/projects/branches/_branch.html.haml +2 -0

No files found.
--- 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