Commit 981d9ba9 authored by Phil Hughes's avatar Phil Hughes

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
parents 611ef0bc 10b9604a
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
%span.badge.badge-success.prepend-left-5 %span.badge.badge-success.prepend-left-5
= s_('Branches|protected') = s_('Branches|protected')
= render_if_exists 'projects/branches/diverged_from_upstream'
.block-truncated .block-truncated
- if commit - if commit
= render 'projects/branches/commit', commit: commit, project: @project = render 'projects/branches/commit', commit: commit, project: @project
......
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