diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-21 05:18:21 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-21 00:34:31 -0500 |
| commit | 1de90e0e6e4866a42b0e478375350c1ba9e302cb (patch) | |
| tree | cb455cfcfe9f8a0883ee435374d756f73bd5e9a5 | |
| parent | 9cfd18d85b49d8c6303c1b7cc5591a8787a5217b (diff) | |
| download | gitlab-ce-1de90e0e6e4866a42b0e478375350c1ba9e302cb.tar.gz | |
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
| -rw-r--r-- | app/views/projects/protected_branches/_create_protected_branch.html.haml | 4 |
1 files 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', |