diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-20 01:36:01 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-20 01:36:01 +0000 |
| commit | 78234c49bcfff330fc67e0584690c696898a7ef7 (patch) | |
| tree | 28671e55f63a88d16d309fac1241c4b645620573 /app/views | |
| parent | 70cc319b87f7a8c8fa57e5fb577d56c519884dda (diff) | |
| parent | 368569f51e1f2c8e406d392339e77f4b3ed08a7f (diff) | |
| download | gitlab-ce-78234c49bcfff330fc67e0584690c696898a7ef7.tar.gz | |
Merge branch '581-ee-backport-branch-permissions' into 'master'
Backport changes from gitlab-org/gitlab-ee!581
See merge request !5884
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/protected_branches/_create_protected_branch.html.haml | 14 |
1 files changed, 8 insertions, 6 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 d4c6fa24768..95d8743f546 100644 --- a/app/views/projects/protected_branches/_create_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml @@ -22,16 +22,18 @@ %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_levels_attributes][0][access_level]', input_id: 'merge_access_levels_attributes' }}) + .js-allowed-to-merge-container + = dropdown_tag('Select', + options: { toggle_class: 'js-allowed-to-merge wide', + 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_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_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }}) + .js-allowed-to-push-container + = dropdown_tag('Select', + options: { toggle_class: 'js-allowed-to-push wide', + 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 |