Merge remote-tracking branch 'ce/8-11-stable' into 8-11-stable-ee

app/assets/javascripts/protected_branch_access_dropdown.js.es6

@@ -41,7 +41,7 @@
 
           if (onSelect) {
             onSelect(item, $el, self);
-          } 
+          }
         }
       });
     }

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' }})