diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-21 05:18:21 +0000 |
|---|---|---|
| committer | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-21 05:18:21 +0000 |
| commit | 311b88c50c528c4b02737216e65b6a09feaf2d8e (patch) | |
| tree | 1a8a816545d6039a66fa9c6881b7488a64fada9d | |
| parent | b8728c0bb0e474edcdceaec9c7b6960bb6d879ac (diff) | |
| parent | acba6042835707d8cbc4d4074ea1ebc3dae690bd (diff) | |
| download | gitlab-ce-311b88c50c528c4b02737216e65b6a09feaf2d8e.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 95d8743f546..16ac75c3d37 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', data: { field_name: 'protected_branch[merge_access_levels_attributes][0][access_level]', input_id: 'merge_access_levels_attributes' }}) @@ -30,7 +30,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', data: { field_name: 'protected_branch[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }}) |