diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-16 21:17:15 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-16 21:17:15 +0100 |
commit | 45953a4c598d23771079a1efbb69dba65e4e642c (patch) | |
tree | dc87b760a319b6bce4275eb91793fa6fe6610e88 /app/views/projects/protected_branches/_create_protected_branch.html.haml | |
parent | 5b52da9c32842849f0b6430a6a820fc7456b4841 (diff) | |
parent | f7e08ad0de580e9f27ad5301542f2913c6bb2bff (diff) | |
download | gitlab-ce-45953a4c598d23771079a1efbb69dba65e4e642c.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-without-slack
Diffstat (limited to 'app/views/projects/protected_branches/_create_protected_branch.html.haml')
-rw-r--r-- | app/views/projects/protected_branches/_create_protected_branch.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/protected_branches/_create_protected_branch.html.haml b/app/views/projects/protected_branches/_create_protected_branch.html.haml index 85d0c494ba8..d4c6fa24768 100644 --- a/app/views/projects/protected_branches/_create_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml @@ -5,6 +5,7 @@ Protect a branch .panel-body .form-horizontal + = form_errors(@protected_branch) .form-group = f.label :name, class: 'col-md-2 text-right' do Branch: @@ -18,19 +19,19 @@ %code production/* are supported .form-group - %label.col-md-2.text-right{ for: 'merge_access_level_attributes' } + %label.col-md-2.text-right{ for: 'merge_access_levels_attributes' } Allowed to merge: .col-md-10 = dropdown_tag('Select', options: { toggle_class: 'js-allowed-to-merge wide', - data: { field_name: 'protected_branch[merge_access_level_attributes][access_level]', input_id: 'merge_access_level_attributes' }}) + data: { field_name: 'protected_branch[merge_access_levels_attributes][0][access_level]', input_id: 'merge_access_levels_attributes' }}) .form-group - %label.col-md-2.text-right{ for: 'push_access_level_attributes' } + %label.col-md-2.text-right{ for: 'push_access_levels_attributes' } Allowed to push: .col-md-10 = dropdown_tag('Select', options: { toggle_class: 'js-allowed-to-push wide', - data: { field_name: 'protected_branch[push_access_level_attributes][access_level]', input_id: 'push_access_level_attributes' }}) + data: { field_name: 'protected_branch[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }}) .panel-footer = f.submit 'Protect', class: 'btn-create btn', disabled: true |