Commit 5f20f5c3 authored by Phil Hughes's avatar Phil Hughes

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

Resolve CE/EE diffs in protected branches

Closes gitlab-ee#11034

See merge request gitlab-org/gitlab-ce!28362
parents 17d8e550 9b1879f0
= render layout: 'projects/protected_branches/shared/protected_branch', locals: { protected_branch: protected_branch } do
= render partial: 'projects/protected_branches/update_protected_branch', locals: { protected_branch: protected_branch }
= render_if_exists 'projects/protected_branches/update_protected_branch', protected_branch: protected_branch
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