Merge branch '326838-remove-code-owner-banner' into 'master'

Remove code owner ribbon move announcement from settings

See merge request gitlab-org/gitlab!62069

ee/app/views/projects/_merge_request_approvals_settings_form.html.haml

@@ -11,17 +11,6 @@
 %fieldset.form-group
   %legend.h5.gl-border-none
     = _('Approval settings')
-  - if project.code_owner_approval_required_available?
-    .gl-alert.gl-alert-info.gl-mb-4.fade.in.show{ role: "alert" }
-      %button.js-close.gl-alert-dismiss{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" }
-        %span
-          = sprite_icon('close', size: 16, css_class: 'gl-icon')
-      %span
-        - banner_url = project_settings_repository_path(project, anchor: 'js-protected-branches-settings')
-        - banner_link_start = '<a href="%{url}"><strong>'.html_safe % { url: banner_url }
-        = _('The "Require approval from CODEOWNERS" setting was moved to %{banner_link_start}Protected Branches%{banner_link_end}').html_safe % { banner_link_start: banner_link_start, banner_link_end: '</strong></a>'.html_safe}
-        = link_to sprite_icon('question-o'), help_page_path('user/project/protected_branches', anchor: 'protected-branches-approval-by-code-owners'), target: '_blank'
-
   .gl-form-checkbox-group
     .gl-form-checkbox.custom-control.custom-checkbox
       = form.check_box(:disable_overriding_approvers_per_merge_request, { class: 'custom-control-input', disabled: !can_modify_approvers })

ee/changelogs/unreleased/326838-remove-code-owner-banner.yml

+---
+title: Remove code owner ribbon move announcement from settings
+merge_request: 62069
+author:
+type: changed

locale/gitlab.pot

@@ -32145,9 +32145,6 @@ msgstr ""
 msgid "The \"%{group_path}\" group allows you to sign in with your Single Sign-On Account"
 msgstr ""
 
-msgid "The \"Require approval from CODEOWNERS\" setting was moved to %{banner_link_start}Protected Branches%{banner_link_end}"
-msgstr ""
-
 msgid "The %{featureName} feature is part of your GitLab Ultimate trial."
 msgstr ""