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

Revise UI text for protected tags

See merge request gitlab-org/gitlab!50476

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

@@ -16,7 +16,7 @@
             %code v*
             or
             %code *-release
-            are supported
+            are supported.
       .form-group.row
         %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
           Allowed to create:

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

@@ -7,16 +7,14 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Limit access to creating and updating tags.
+      Limit access to creating and updating tags. #{link_to "What are protected tags?", help_page_path("user/project/protected_tags")}
   .settings-content
     %p
-      By default, protected tags are designed to:
+      By default, protected tags protect your code and:
       %ul
-        %li Prevent tag creation by everybody except Maintainers
-        %li Prevent <strong>anyone</strong> from updating the tag
-        %li Prevent <strong>anyone</strong> from deleting the tag
-
-    %p Read more about #{link_to "protected tags", help_page_path("user/project/protected_tags")}.
+        %li Allow only users with Maintainer #{link_to "permissions", help_page_path("user/permissions")} to create tags.
+        %li Prevent <strong>anyone</strong> from updating tags.
+        %li Prevent <strong>anyone</strong> from deleting tags.
 
     - if can? current_user, :admin_project, @project
       = yield :create_protected_tag

app/views/projects/protected_tags/shared/_tags_list.html.haml

 .protected-tags-list.js-protected-tags-list
   - if @protected_tags.empty?
     .card-header
-      Protected tag (#{@protected_tags_count})
+      Protected tags (#{@protected_tags_count})
     %p.settings-message.text-center
-      There are currently no protected tags, protect a tag with the form above.
+      No tags are protected.
   - else
     - can_admin_project = can?(current_user, :admin_project, @project)
 
@@ -16,7 +16,7 @@
           %col
       %thead
         %tr
-          %th Protected tag (#{@protected_tags_count})
+          %th Protected tags (#{@protected_tags_count})
           %th Last commit
           %th Allowed to create
           - if can_admin_project

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

+---
+title: Updated UI text to match style guidelines
+merge_request: 50476
+author:
+type: other

spec/features/protected_tags_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe 'Protected Tags', :js do
       click_on "Protect"
 
       within(".protected-tags-list") do
-        expect(page).to have_content("Protected tag (2)")
+        expect(page).to have_content("Protected tags (2)")
         expect(page).to have_content("2 matching tags")
       end
     end