Merge branch 'aqualls-okr-protected-branches' into 'master'

Revise UI text for protected branches

See merge request gitlab-org/gitlab!50475

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

@@ -13,7 +13,7 @@
           .form-text.text-muted
             - wildcards_url = help_page_url('user/project/protected_branches', anchor: 'wildcard-protected-branches')
             - wildcards_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: wildcards_url }
-            = (s_("ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported") % { wildcards_link_start: wildcards_link_start, wildcards_link_end: '</a>', code_tag_start: '<code>', code_tag_end: '</code>' }).html_safe
+            = (s_("ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported.") % { wildcards_link_start: wildcards_link_start, wildcards_link_end: '</a>', code_tag_start: '<code>', code_tag_end: '</code>' }).html_safe
       .form-group.row
         %label.col-md-2.text-right{ for: 'merge_access_levels_attributes' }
           = s_("ProtectedBranch|Allowed to merge:")

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

@@ -7,16 +7,15 @@
     %button.btn.js-settings-toggle.qa-expand-protected-branches{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Keep stable branches secure and force developers to use merge requests.
+      Keep stable branches secure, and force developers to use merge requests. #{link_to "What are protected branches?", help_page_path("user/project/protected_branches")}
   .settings-content
     %p
-      By default, protected branches are designed to:
+      By default, protected branches protect your code and:
       %ul
-        %li prevent their creation, if not already created, from everybody except Maintainers
-        %li prevent pushes from everybody except Maintainers
-        %li prevent <strong>anyone</strong> from force pushing to the branch
-        %li prevent <strong>anyone</strong> from deleting the branch
-      %p Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches")} and #{link_to "project permissions", help_page_path("user/permissions")}.
+        %li Allow only users with Maintainer #{link_to "permissions", help_page_path("user/permissions")} to create new protected branches.
+        %li Allow only users with Maintainer permissions to push code.
+        %li Prevent <strong>anyone</strong> from force-pushing to the branch.
+        %li Prevent <strong>anyone</strong> from deleting the branch.
 
     - if can? current_user, :admin_project, @project
       = content_for :create_protected_branch

changelogs/unreleased/aqualls-okr-protected-branches.yml

+---
+title: Updated UI text to match style guidelines
+merge_request: 50475
+author: Amy Qualls @aqualls
+type: other

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

@@ -5,4 +5,4 @@
     .col-md-10
       = render "shared/buttons/project_feature_toggle", label: s_("ProtectedBranch|Toggle code owner approval"), class_list: "js-code-owner-toggle project-feature-toggle is-checked"
       .form-text.text-muted
-        = s_("ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected")
+        = s_("ProtectedBranch|Reject code pushes that change files listed in the CODEOWNERS file.")

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

@@ -11,8 +11,7 @@
                    dropdown_class: 'dropdown-menu-user dropdown-menu-selectable qa-allowed-to-push-dropdown capitalize-header', filter: true,
                    data: { input_id: 'push_access_levels_attributes', default_label: 'Select' } })
   .form-text.text-muted
-    Only groups that
-    = link_to 'have this project shared', help_page_path('user/project/members/share_project_with_groups')
-    can be added here
+    You can add only groups that have this project shared.
+    = link_to 'Learn more.', help_page_path('user/project/members/share_project_with_groups')
 
 = render 'projects/protected_branches/shared/create_protected_branch'

ee/app/views/projects/protected_tags/ee/_create_protected_tag.html.haml

@@ -6,8 +6,7 @@
                    dropdown_qa_selector: 'access_levels_content',
                    data: { input_id: 'create_access_levels_attributes', default_label: 'Select', qa_selector: 'access_levels_dropdown' } })
   .form-text.text-muted
-    Only groups that
-    = link_to 'have this project shared', help_page_path('user/project/members/share_project_with_groups')
-    can be added here
+    You can add only groups that have this project shared.
+    = link_to 'Learn more.', help_page_path('user/project/members/share_project_with_groups')
 
 = render 'projects/protected_tags/shared/create_protected_tag'

locale/gitlab.pot

@@ -22681,7 +22681,7 @@ msgstr ""
 msgid "Protected branches"
 msgstr ""
 
-msgid "ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported"
+msgid "ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported."
 msgstr ""
 
 msgid "ProtectedBranch|Allowed to merge"
@@ -22714,7 +22714,7 @@ msgstr ""
 msgid "ProtectedBranch|Protected branch (%{protected_branches_count})"
 msgstr ""
 
-msgid "ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected"
+msgid "ProtectedBranch|Reject code pushes that change files listed in the CODEOWNERS file."
 msgstr ""
 
 msgid "ProtectedBranch|Require approval from code owners:"