Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 5 insertions, 6 deletions

diff --git a/app/views/projects/settings/access_tokens/index.html.haml b/app/views/projects/settings/access_tokens/index.html.haml
index 01f3e441eef..1bf252b6282 100644
--- a/app/views/projects/settings/access_tokens/index.html.haml
+++ b/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',