diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-17 08:26:01 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-17 08:26:01 +0000 |
| commit | 5f20f5c3b680fac25a0c1a0b62708152c73364bb (patch) | |
| tree | 9edd58d18632dc734a9f9d5e463d996147d7aacf | |
| parent | 17d8e5502eff2e1e8344f3267d9923975a25dd59 (diff) | |
| parent | 9b1879f014ac59eea1a268f82671e0981694c5b6 (diff) | |
| download | gitlab-ce-5f20f5c3b680fac25a0c1a0b62708152c73364bb.tar.gz | |
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
| -rw-r--r-- | app/views/projects/protected_branches/_protected_branch.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/protected_branches/_protected_branch.html.haml b/app/views/projects/protected_branches/_protected_branch.html.haml index b12ae995ece..366d7a7a2eb 100644 --- a/app/views/projects/protected_branches/_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_protected_branch.html.haml @@ -1,2 +1,2 @@ = 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 |