Merge branch 'ap-access-tokens-ui-text-okr' into 'master'

Review and revise project access tokens UI text

See merge request gitlab-org/gitlab!59878

app/views/projects/settings/access_tokens/index.html.haml

@@ -9,13 +9,13 @@
     %h4.gl-mt-0
       = page_title
     %p
+    - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/settings/project_access_tokens') }
     - if current_user.can?(:create_resource_access_tokens, @project)
-      = _('You can generate an access token scoped to this project for each application to use the GitLab API.')
-      -# Commented out until https://gitlab.com/gitlab-org/gitlab/-/issues/219551 is fixed
-      -# %p
-      -#   = _('You can also use project access tokens to authenticate against Git over HTTP.')
+      = _('Generate project access tokens scoped to this project for your applications that need access to the GitLab API.')
+      %p
+        = _('You can also use project access tokens with Git to authenticate over HTTP(S). %{link_start}Learn more.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
     - else
-      = _('Project access token creation is disabled in this group. You can still use and manage existing tokens.')
+      = _('Project access token creation is disabled in this group. You can still use and manage existing tokens. %{link_start}Learn more.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       %p
       - root_group = @project.group.root_ancestor
       - if current_user.can?(:admin_group, root_group)
@@ -23,7 +23,6 @@
         - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: group_settings_link }
         = _('You can enable project access token creation in %{link_start}group settings%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
 
-
   .col-lg-8
     - if @new_project_access_token
       = render 'shared/access_tokens/created_container',

changelogs/unreleased/ap-access-tokens-ui-text-okr.yml

+---
+title: Revise project access tokens UI text
+merge_request: 59878
+author:
+type: other

locale/gitlab.pot

@@ -14263,6 +14263,9 @@ msgstr ""
 msgid "Generate new token"
 msgstr ""
 
+msgid "Generate project access tokens scoped to this project for your applications that need access to the GitLab API."
+msgstr ""
+
 msgid "Generate site and private keys at"
 msgstr ""
 
@@ -24893,7 +24896,7 @@ msgstr ""
 msgid "Project access must be granted explicitly to each user. If this project is part of a group, access will be granted to members of the group."
 msgstr ""
 
-msgid "Project access token creation is disabled in this group. You can still use and manage existing tokens."
+msgid "Project access token creation is disabled in this group. You can still use and manage existing tokens. %{link_start}Learn more.%{link_end}"
 msgstr ""
 
 msgid "Project already deleted"
@@ -36300,6 +36303,9 @@ msgstr ""
 msgid "You can also upload existing files from your computer using the instructions below."
 msgstr ""
 
+msgid "You can also use project access tokens with Git to authenticate over HTTP(S). %{link_start}Learn more.%{link_end}"
+msgstr ""
+
 msgid "You can always edit this later"
 msgstr ""
 
@@ -36345,9 +36351,6 @@ msgstr ""
 msgid "You can find more information about GitLab subscriptions in %{subscriptions_doc_link}."
 msgstr ""
 
-msgid "You can generate an access token scoped to this project for each application to use the GitLab API."
-msgstr ""
-
 msgid "You can get started by cloning the repository or start adding files to it with one of the following options."
 msgstr ""
 

spec/features/projects/settings/access_tokens_spec.rb

@@ -99,7 +99,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
           visit project_settings_access_tokens_path(personal_project)
 
           expect(page).to have_selector('#new_project_access_token')
-          expect(page).to have_text('You can generate an access token scoped to this project for each application to use the GitLab API.')
+          expect(page).to have_text('Generate project access tokens scoped to this project for your applications that need access to the GitLab API.')
         end
       end