Merge branch '247476-remove-angle-brackets-in-no-scopes' into 'master'

Remove brackets in "no scopes selected" message

See merge request gitlab-org/gitlab!47628

app/views/shared/access_tokens/_table.html.haml

@@ -42,7 +42,7 @@
                     = _('In %{time_to_now}') % { time_to_now: distance_of_time_in_words_to_now(token.expires_at) }
               - else
                 %span.token-never-expires-label= _('Never')
-            %td= token.scopes.present? ? token.scopes.join(', ') : html_escape_once(_('<no scopes selected>')).html_safe
+            %td= token.scopes.present? ? token.scopes.join(', ') : _('no scopes selected')
             %td= link_to _('Revoke'), revoke_route_helper.call(token), method: :put, class: 'btn btn-danger float-right qa-revoke-button', data: { confirm: _('Are you sure you want to revoke this %{type}? This action cannot be undone.') % { type: type } }
 - else
   .settings-message.text-center

app/views/shared/deploy_tokens/_table.html.haml

@@ -23,7 +23,7 @@
                   In #{distance_of_time_in_words_to_now(token.expires_at)}
               - else
                 %span.token-never-expires-label= _('Never')
-            %td= token.scopes.present? ? token.scopes.join(", ") : html_escape_once(_('<no scopes selected>')).html_safe
+            %td= token.scopes.present? ? token.scopes.join(', ') : _('no scopes selected')
             %td= link_to s_('DeployTokens|Revoke'), "#", class: "btn btn-danger float-right", data: { toggle: "modal", target: "#revoke-modal-#{token.id}"}
             = render 'shared/deploy_tokens/revoke_modal', token: token, group_or_project: group_or_project
 - else

changelogs/unreleased/247476-remove-angle-brackets-in-no-scopes.yml

+---
+title: Remove brackets in no scopes selected message in access and deploy tokens lists
+merge_request: 47628
+author:
+type: changed

locale/gitlab.pot

@@ -896,9 +896,6 @@ msgstr ""
 msgid "< 1 hour"
 msgstr ""
 
-msgid "<no scopes selected>"
-msgstr ""
-
 msgid "'%{data}' at %{location} does not match format: %{format}"
 msgstr ""
 
@@ -32767,6 +32764,9 @@ msgstr ""
 msgid "no one can merge"
 msgstr ""
 
+msgid "no scopes selected"
+msgstr ""
+
 msgid "none"
 msgstr ""