diff options
| author | Jose <jivanvl@hotmail.com> | 2018-05-01 01:00:16 +0300 |
|---|---|---|
| committer | Jose <jivanvl@hotmail.com> | 2018-05-01 01:00:16 +0300 |
| commit | d3327e0dfacd27d547ffdb3b7f4a1a76c76ae281 (patch) | |
| tree | 82019118f22877ec9135d45620c9dcf8acd0579e /app/views/projects/protected_branches/_branches_list.html.haml | |
| parent | f48f40bf267fd0f35ba09fd3b8f30e17c0789327 (diff) | |
| parent | 2f7b71df7619768220657ed47c7737f4c3e19e90 (diff) | |
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
Diffstat (limited to 'app/views/projects/protected_branches/_branches_list.html.haml')
| -rw-r--r-- | app/views/projects/protected_branches/_branches_list.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml index 5377d745371..24d2b971472 100644 --- a/app/views/projects/protected_branches/_branches_list.html.haml +++ b/app/views/projects/protected_branches/_branches_list.html.haml @@ -1,4 +1,4 @@ - can_admin_project = can?(current_user, :admin_project, @project) = render layout: 'projects/protected_branches/shared/branches_list', locals: { can_admin_project: can_admin_project } do - = render partial: 'projects/protected_branches/protected_branch', collection: @protected_branches, locals: { can_admin_project: can_admin_project} + = render partial: 'projects/protected_branches/protected_branch', collection: @protected_branches |