Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 2 deletions

diff --git a/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue b/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue
index 486baccfad0..c49ab1ac43c 100644
--- a/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue
+++ b/app/assets/javascripts/deploy_tokens/components/new_deploy_token.vue
@@ -66,6 +66,11 @@ export default {
     },
   },
   methods: {
+    getWritePackageRegistryHelpText() {
+      return this.tokenType === 'group'
+        ? this.$options.translations.groupWritePackageRegistryHelp
+        : this.$options.translations.projectWritePackageRegistryHelp;
+    },
     defaultData() {
       return {
         expiresAt: null,
@@ -110,7 +115,7 @@ export default {
             id: 'deploy_token_write_package_registry',
             isShown: this.$props.packagesRegistryEnabled,
             value: false,
-            helpText: this.$options.translations.writePackageRegistryHelp,
+            helpText: this.getWritePackageRegistryHelpText(),
             scopeName: 'write_package_registry',
           },
         ],
diff --git a/app/assets/javascripts/deploy_tokens/deploy_token_translations.js b/app/assets/javascripts/deploy_tokens/deploy_token_translations.js
index 3767e9e6170..410864a83a2 100644
--- a/app/assets/javascripts/deploy_tokens/deploy_token_translations.js
+++ b/app/assets/javascripts/deploy_tokens/deploy_token_translations.js
@@ -32,9 +32,12 @@ const translations = {
   readRegistryHelp: s__('DeployTokens|Allows read-only access to registry images.'),
   writeRegistryHelp: s__('DeployTokens|Allows read and write access to registry images.'),
   readPackageRegistryHelp: s__('DeployTokens|Allows read-only access to the package registry.'),
-  writePackageRegistryHelp: s__(
+  groupWritePackageRegistryHelp: s__(
     'DeployTokens|Allows read and write access to the package registry.',
   ),
+  projectWritePackageRegistryHelp: s__(
+    'DeployTokens|Allows read, write and delete access to the package registry.',
+  ),
   createTokenFailedAlert: s__('DeployTokens|Failed to create a new deployment token'),
 };