From 1de90e0e6e4866a42b0e478375350c1ba9e302cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila=20Santos?= Date: Sun, 21 Aug 2016 05:18:21 +0000 Subject: Merge branch 'ce-fix-protected-branch' into 'master' Fix inputs not being found due to incorrect class in wrap element Fixes failing spec See merge request !5926 --- .../projects/protected_branches/_create_protected_branch.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 226f8311a90..e95a3b1b4c3 100644 --- a/app/views/projects/protected_branches/_create_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml @@ -22,7 +22,7 @@ %label.col-md-2.text-right{ for: 'merge_access_levels_attributes' } Allowed to merge: .col-md-10 - .js-allowed-to-merge-container + .merge_access_levels-container = dropdown_tag('Select', options: { toggle_class: 'js-allowed-to-merge wide', dropdown_class: 'dropdown-menu-selectable', @@ -31,7 +31,7 @@ %label.col-md-2.text-right{ for: 'push_access_levels_attributes' } Allowed to push: .col-md-10 - .js-allowed-to-push-container + .push_access_levels-container = dropdown_tag('Select', options: { toggle_class: 'js-allowed-to-push wide', dropdown_class: 'dropdown-menu-selectable', -- cgit v1.2.1