Merge branch 'ph/fixProtectedBranchesFlash' into 'master'

Fixed protected branches flash styling

See merge request gitlab-org/gitlab!18955

app/views/projects/protected_branches/shared/_branches_list.html.haml

@@ -5,6 +5,7 @@
     %p.settings-message.text-center
       = s_("ProtectedBranch|There are currently no protected branches, protect a branch with the form above.")
   - else
+    .flash-container
     %table.table.table-bordered
       %colgroup
         %col{ width: "20%" }
@@ -27,8 +28,6 @@
           - if can_admin_project
             %th
       %tbody
-        %tr
-          %td.flash-container{ colspan: 5 }
         = yield
 
     = paginate @protected_branches, theme: 'gitlab'

changelogs/unreleased/ph-fixProtectedBranchesFlash.yml

+---
+title: Fixed protected branches flash styling
+merge_request:
+author:
+type: fixed