Commit 3239156c authored by Luke Bennett's avatar Luke Bennett

Resolve CE/EE diffs in projects branches

Part of single codebase changes.
parent 26ca0875
......@@ -22,10 +22,7 @@
%span.badge.badge-success.prepend-left-5
= s_('Branches|protected')
- if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
%span.badge.badge-danger.prepend-left-5.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
= icon('exclamation-triangle')
= s_('Branches|diverged from upstream')
= render_if_exists 'projects/branches/diverged_from_upstream'
.block-truncated
- if commit
......
- if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
%span.badge.badge-danger.prepend-left-5.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
= icon('exclamation-triangle')
= s_('Branches|diverged from upstream')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment