Merge branch '34291-code-owner-ribbon' into 'master'

Add code owner ribbon move announcement

Closes #34291

See merge request gitlab-org/gitlab!18715

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

@@ -12,6 +12,17 @@
     .text-center.prepend-top-default
       = sprite_icon('spinner', size: 24, css_class: 'gl-spinner')
 
+- if project.code_owner_approval_required_available?
+  .alert.alert-dismissible.alert-primary.fade.in.show{ role: "alert" }
+    %button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" }
+      %span
+        = sprite_icon('close', size: 16)
+    %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 icon('question-circle'), help_page_path('user/project/protected_branches', anchor: 'protected-branches-approval-by-code-owners-premium'), target: '_blank'
+
 .form-group
   .form-check
     = form.check_box(:disable_overriding_approvers_per_merge_request, { checked: can_override_approvers, class: 'form-check-input' }, false, true)

ee/changelogs/unreleased/34291-code-owner-ribbon.yml

+---
+title: Add alert message for feature 'require approval from code owners' being moved
+merge_request: 18715
+author:
+type: changed

locale/gitlab.pot

@@ -16213,6 +16213,9 @@ 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 %{type} contains the following error:"
 msgid_plural "The %{type} contains the following errors:"
 msgstr[0] ""