Merge branch '35097-allowed-to-push-should-supersede-code-owner-approval' into 'master'

Add tooltip to clarify interaction of code owner approval and allowed to... values

See merge request gitlab-org/gitlab!42725

ee/app/views/projects/protected_branches/ee/_code_owner_approval_table_head.html.haml

 - if @project.feature_available?(:code_owner_approval_required)
   %th
     = s_("ProtectedBranch|Code owner approval")
+    %span.sr-only
+      = "(" << s_("ProtectedBranch|Does not apply to users allowed to merge or push.") << ")"
+    %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Does not apply to users allowed to merge or push.'), 'aria-hidden': 'true' }
+      = sprite_icon('question', size: 16, css_class: 'gl-text-gray-500')

ee/changelogs/unreleased/feature-add-code-owners-allowed-to-tooltip.yml

+---
+title: Add tooltip to header for Code Owner Approval toggle in repository settings
+merge_request: 42725
+author:
+type: other

locale/gitlab.pot

@@ -21113,6 +21113,9 @@ msgstr ""
 msgid "ProtectedBranch|Code owner approval"
 msgstr ""
 
+msgid "ProtectedBranch|Does not apply to users allowed to merge or push."
+msgstr ""
+
 msgid "ProtectedBranch|Protect"
 msgstr ""