Commit c16c5bf6 authored by Amy Qualls's avatar Amy Qualls Committed by Denys Mishunov

Revise UI text for protected tags

Revise the text for protected tags to make it less wordy, and adhere
more closely to GitLab tone and style.
parent 96a64f64
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%code v* %code v*
or or
%code *-release %code *-release
are supported are supported.
.form-group.row .form-group.row
%label.col-md-2.text-right{ for: 'create_access_levels_attributes' } %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
Allowed to create: Allowed to create:
......
...@@ -7,16 +7,14 @@ ...@@ -7,16 +7,14 @@
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %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 .settings-content
%p %p
By default, protected tags are designed to: By default, protected tags protect your code and:
%ul %ul
%li Prevent tag creation by everybody except Maintainers %li Allow only users with Maintainer #{link_to "permissions", help_page_path("user/permissions")} to create tags.
%li Prevent <strong>anyone</strong> from updating the tag %li Prevent <strong>anyone</strong> from updating tags.
%li Prevent <strong>anyone</strong> from deleting the tag %li Prevent <strong>anyone</strong> from deleting tags.
%p Read more about #{link_to "protected tags", help_page_path("user/project/protected_tags")}.
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
= yield :create_protected_tag = yield :create_protected_tag
......
.protected-tags-list.js-protected-tags-list .protected-tags-list.js-protected-tags-list
- if @protected_tags.empty? - if @protected_tags.empty?
.card-header .card-header
Protected tag (#{@protected_tags_count}) Protected tags (#{@protected_tags_count})
%p.settings-message.text-center %p.settings-message.text-center
There are currently no protected tags, protect a tag with the form above. No tags are protected.
- else - else
- can_admin_project = can?(current_user, :admin_project, @project) - can_admin_project = can?(current_user, :admin_project, @project)
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%col %col
%thead %thead
%tr %tr
%th Protected tag (#{@protected_tags_count}) %th Protected tags (#{@protected_tags_count})
%th Last commit %th Last commit
%th Allowed to create %th Allowed to create
- if can_admin_project - if can_admin_project
......
---
title: Updated UI text to match style guidelines
merge_request: 50476
author:
type: other
...@@ -68,7 +68,7 @@ RSpec.describe 'Protected Tags', :js do ...@@ -68,7 +68,7 @@ RSpec.describe 'Protected Tags', :js do
click_on "Protect" click_on "Protect"
within(".protected-tags-list") do 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") expect(page).to have_content("2 matching tags")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment