Commit b710c50f authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Revise project access tokens UI text

Changelog: other
parent ba41e132
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
%h4.gl-mt-0 %h4.gl-mt-0
= page_title = page_title
%p %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) - 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.') = _('Generate project access tokens scoped to this project for your applications that need access to the GitLab API.')
-# Commented out until https://gitlab.com/gitlab-org/gitlab/-/issues/219551 is fixed %p
-# %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 }
-# = _('You can also use project access tokens to authenticate against Git over HTTP.')
- else - 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 %p
- root_group = @project.group.root_ancestor - root_group = @project.group.root_ancestor
- if current_user.can?(:admin_group, root_group) - if current_user.can?(:admin_group, root_group)
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: group_settings_link } - 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 } = _('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 .col-lg-8
- if @new_project_access_token - if @new_project_access_token
= render 'shared/access_tokens/created_container', = render 'shared/access_tokens/created_container',
......
---
title: Revise project access tokens UI text
merge_request: 59878
author:
type: other
...@@ -14200,6 +14200,9 @@ msgstr "" ...@@ -14200,6 +14200,9 @@ msgstr ""
msgid "Generate new token" msgid "Generate new token"
msgstr "" 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" msgid "Generate site and private keys at"
msgstr "" msgstr ""
...@@ -24749,7 +24752,7 @@ msgstr "" ...@@ -24749,7 +24752,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." 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 "" 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 "" msgstr ""
msgid "Project already deleted" msgid "Project already deleted"
...@@ -36081,6 +36084,9 @@ msgstr "" ...@@ -36081,6 +36084,9 @@ msgstr ""
msgid "You can also upload existing files from your computer using the instructions below." msgid "You can also upload existing files from your computer using the instructions below."
msgstr "" 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" msgid "You can always edit this later"
msgstr "" msgstr ""
...@@ -36126,9 +36132,6 @@ msgstr "" ...@@ -36126,9 +36132,6 @@ msgstr ""
msgid "You can find more information about GitLab subscriptions in %{subscriptions_doc_link}." msgid "You can find more information about GitLab subscriptions in %{subscriptions_doc_link}."
msgstr "" 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." msgid "You can get started by cloning the repository or start adding files to it with one of the following options."
msgstr "" msgstr ""
......
...@@ -99,7 +99,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do ...@@ -99,7 +99,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
visit project_settings_access_tokens_path(personal_project) visit project_settings_access_tokens_path(personal_project)
expect(page).to have_selector('#new_project_access_token') 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
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