diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-05 00:09:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-05 00:09:50 +0300 |
commit | 1dbd5e4a8082d0ca86a8b2dad73b34523be137db (patch) | |
tree | f67f6dd95bc0faf603de3894bb5e433ce64972db /app/assets/javascripts/token_access | |
parent | 43fb9e32f29817020267b13616c6670512fc5eab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/token_access')
-rw-r--r-- | app/assets/javascripts/token_access/components/inbound_token_access.vue | 11 | ||||
-rw-r--r-- | app/assets/javascripts/token_access/components/outbound_token_access.vue | 13 |
2 files changed, 20 insertions, 4 deletions
diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue index eb1222d5130..ac359b4f901 100644 --- a/app/assets/javascripts/token_access/components/inbound_token_access.vue +++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue @@ -21,9 +21,9 @@ import TokenProjectsTable from './token_projects_table.vue'; export default { i18n: { - toggleLabelTitle: s__('CICD|Allow access to this project with a CI_JOB_TOKEN'), + toggleLabelTitle: s__('CICD|Limit access %{italicStart}to%{italicEnd} this project'), toggleHelpText: s__( - `CICD|Manage which projects can use their CI_JOB_TOKEN to access this project. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API. %{linkStart}Learn more.%{linkEnd}`, + `CICD|Prevent access to this project from other project CI/CD job tokens, unless the other project is added to the allowlist. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API. %{linkStart}Learn more.%{linkEnd}`, ), cardHeaderTitle: s__( 'CICD|Allow CI job tokens from the following projects to access this project', @@ -209,6 +209,13 @@ export default { :label="$options.i18n.toggleLabelTitle" @change="updateCIJobTokenScope" > + <template #label> + <gl-sprintf :message="$options.i18n.toggleLabelTitle"> + <template #italic="{ content }"> + <i>{{ content }}</i> + </template> + </gl-sprintf> + </template> <template #help> <gl-sprintf :message="$options.i18n.toggleHelpText"> <template #link="{ content }"> diff --git a/app/assets/javascripts/token_access/components/outbound_token_access.vue b/app/assets/javascripts/token_access/components/outbound_token_access.vue index f70bb77b780..cad1fff062a 100644 --- a/app/assets/javascripts/token_access/components/outbound_token_access.vue +++ b/app/assets/javascripts/token_access/components/outbound_token_access.vue @@ -23,9 +23,11 @@ import TokenProjectsTable from './token_projects_table.vue'; // Note: This component will be removed in 17.0, as the outbound access token is getting deprecated export default { i18n: { - toggleLabelTitle: s__('CICD|Limit CI_JOB_TOKEN access'), + toggleLabelTitle: s__( + 'CICD|Limit access %{italicStart}from%{italicEnd} this project (Deprecated)', + ), toggleHelpText: s__( - `CICD|Select the projects that can be accessed by API requests authenticated with this project's CI_JOB_TOKEN CI/CD variable. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API. %{linkStart}Learn more.%{linkEnd}`, + `CICD|Prevent CI/CD job tokens from this project from being used to access other projects unless the other project is added to the allowlist. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API. %{linkStart}Learn more.%{linkEnd}`, ), cardHeaderTitle: s__('CICD|Add an existing project to the scope'), settingDisabledMessage: s__( @@ -246,6 +248,13 @@ export default { :disabled="disableTokenToggle" @change="updateCIJobTokenScope" > + <template #label> + <gl-sprintf :message="$options.i18n.toggleLabelTitle"> + <template #italic="{ content }"> + <i>{{ content }}</i> + </template> + </gl-sprintf> + </template> <template #help> <gl-sprintf :message="$options.i18n.toggleHelpText"> <template #link="{ content }"> |