root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-07-10 03:08:21 +00:00
parent 1c1719d8be
commit 83f0b8fcb5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/token_access/components/token_access.vue
View File

@ -13,7 +13,7 @@ export default {
i18n: {
toggleLabelTitle: s__('CICD|Limit CI_JOB_TOKEN access'),
toggleHelpText: s__(
`CICD|Manage which projects can use this project's CI_JOB_TOKEN CI/CD variable for API access`,
`CICD|Select projects that can be accessed by API requests authenticated with this project's CI_JOB_TOKEN CI/CD variable.`,
),
cardHeaderTitle: s__('CICD|Add an existing project to the scope'),
formGroupLabel: __('Search for project'),

2
app/assets/javascripts/token_access/components/token_projects_table.vue
View File

@ -13,7 +13,7 @@ export default {
fields: [
{
key: 'project',
label: __('Projects with access'),
label: __('Projects that can be accessed'),
tdClass: 'gl-p-5!',
...defaultTableClasses,
columnClass: 'gl-w-85p',

2
app/views/projects/settings/ci_cd/show.html.haml
View File

@ -104,7 +104,7 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _("Control which projects can use the CI_JOB_TOKEN CI/CD variable for API access to this project. It is a security risk to disable this feature, because unauthorized projects may attempt to retrieve an active token and access the API.")
= _("Control which projects 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.")
= link_to _('Learn more'), help_page_path('api/index', anchor: 'limit-gitlab-cicd-job-token-access'), target: '_blank', rel: 'noopener noreferrer'
.settings-content
= render 'ci/token_access/index'

10
locale/gitlab.pot
View File

@ -5871,7 +5871,7 @@ msgstr ""
msgid "CICD|Limit CI_JOB_TOKEN access"
msgstr ""
msgid "CICD|Manage which projects can use this project's CI_JOB_TOKEN CI/CD variable for API access"
msgid "CICD|Select projects that can be accessed by API requests authenticated with this project's CI_JOB_TOKEN CI/CD variable."
msgstr ""
msgid "CICD|The Auto DevOps pipeline runs by default in all projects with no CI/CD configuration file."
@ -8864,7 +8864,7 @@ msgstr ""
msgid "Control whether to display third-party offers in GitLab."
msgstr ""
msgid "Control which projects can use the CI_JOB_TOKEN CI/CD variable for API access to this project. It is a security risk to disable this feature, because unauthorized projects may attempt to retrieve an active token and access the API."
msgid "Control which projects 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."
msgstr ""
msgid "Cookie domain"
@ -26095,6 +26095,9 @@ msgstr ""
msgid "Projects shared with %{group_name}"
msgstr ""
msgid "Projects that can be accessed"
msgstr ""
msgid "Projects to index"
msgstr ""
@ -26104,9 +26107,6 @@ msgstr ""
msgid "Projects will be permanently deleted immediately."
msgstr ""
msgid "Projects with access"
msgstr ""
msgid "Projects with critical vulnerabilities"
msgstr ""