kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'project-branches-scb' into 'master'

Browse source 
Resolve CE/EE diffs in projects branches

Closes gitlab-ee#10498

See merge request gitlab-org/gitlab-ce!28521
This commit is contained in:
Phil Hughes 2019-05-21 11:56:21 +00:00
commit 981d9ba956
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/branches/_branch.html.haml
View file

@ -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