Merge branch...

Merge branch '344338-make-badges-in-app-views-projects-protected_branches-shared-_protected_branch-html-haml' into 'master'

Make badge in shared/_protected_branch partial Pajamas-compliant

See merge request gitlab-org/gitlab!76998

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

@@ -5,7 +5,7 @@
     %span.ref-name= protected_branch.name
 
     - if @project.root_ref?(protected_branch.name)
-      %span.badge.gl-badge.badge-pill.badge-info.d-inline default
+      = gl_badge_tag s_('ProtectedBranch|default'), variant: :info
 
     %div
       - if protected_branch.wildcard?
@@ -20,4 +20,4 @@
 
   - if can_admin_project
     %td
-      = link_to 'Unprotect', [@project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn gl-button btn-warning"
+      = link_to s_('ProtectedBranch|Unprotect'), [@project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: s_('ProtectedBranch|Branch will be writable for developers. Are you sure?') }, method: :delete, class: "btn gl-button btn-warning"

locale/gitlab.pot

@@ -28537,6 +28537,9 @@ msgstr ""
 msgid "ProtectedBranch|Branch"
 msgstr ""
 
+msgid "ProtectedBranch|Branch will be writable for developers. Are you sure?"
+msgstr ""
+
 msgid "ProtectedBranch|Branch:"
 msgstr ""
 
@@ -28582,6 +28585,9 @@ msgstr ""
 msgid "ProtectedBranch|Toggle code owner approval"
 msgstr ""
 
+msgid "ProtectedBranch|Unprotect"
+msgstr ""
+
 msgid "ProtectedBranch|What are protected branches?"
 msgstr ""