Add latest changes from gitlab-org/gitlab@master

4 files changed, 25 insertions, 5 deletions

diff --git a/app/assets/javascripts/lib/utils/secret_detection.js b/app/assets/javascripts/lib/utils/secret_detection.js
index 49de7b3a081..4d8612aeeff 100644
--- a/app/assets/javascripts/lib/utils/secret_detection.js
+++ b/app/assets/javascripts/lib/utils/secret_detection.js
@@ -28,6 +28,10 @@ export const containsSensitiveToken = (message) => {
       name: 'GitLab OAuth Application Secret',
       regex: `gloas-[0-9a-zA-Z_-]{64}`,
     },
+    {
+      name: 'GitLab Deploy Token',
+      regex: `gldt-[0-9a-zA-Z_-]{20}`,
+    },
   ];
 
   for (const rule of sensitiveDataPatterns) {
diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue
index 4cc9cc190e8..06af69ff250 100644
--- a/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue
+++ b/app/assets/javascripts/packages_and_registries/settings/project/components/registry_settings_app.vue
@@ -6,16 +6,24 @@ import {
   SHOW_SETUP_SUCCESS_ALERT,
   UPDATE_SETTINGS_SUCCESS_MESSAGE,
 } from '~/packages_and_registries/settings/project/constants';
-import ContainerExpirationPolicy from './container_expiration_policy.vue';
-import PackagesCleanupPolicy from './packages_cleanup_policy.vue';
+import ContainerExpirationPolicy from '~/packages_and_registries/settings/project/components/container_expiration_policy.vue';
+import PackagesCleanupPolicy from '~/packages_and_registries/settings/project/components/packages_cleanup_policy.vue';
 
 export default {
   components: {
     ContainerExpirationPolicy,
+    DependencyProxyPackagesSettings: () =>
+      import(
+        'ee_component/packages_and_registries/settings/project/components/dependency_proxy_packages_settings.vue'
+      ),
     GlAlert,
     PackagesCleanupPolicy,
   },
-  inject: ['showContainerRegistrySettings', 'showPackageRegistrySettings'],
+  inject: [
+    'showContainerRegistrySettings',
+    'showPackageRegistrySettings',
+    'showDependencyProxySettings',
+  ],
   i18n: {
     UPDATE_SETTINGS_SUCCESS_MESSAGE,
   },
@@ -54,5 +62,6 @@ export default {
     </gl-alert>
     <packages-cleanup-policy v-if="showPackageRegistrySettings" />
     <container-expiration-policy v-if="showContainerRegistrySettings" />
+    <dependency-proxy-packages-settings v-if="showDependencyProxySettings" />
   </div>
 </template>
diff --git a/app/assets/javascripts/packages_and_registries/settings/project/registry_settings_bundle.js b/app/assets/javascripts/packages_and_registries/settings/project/registry_settings_bundle.js
index 57c8d07e620..326265430d9 100644
--- a/app/assets/javascripts/packages_and_registries/settings/project/registry_settings_bundle.js
+++ b/app/assets/javascripts/packages_and_registries/settings/project/registry_settings_bundle.js
@@ -23,6 +23,7 @@ export default () => {
     helpPagePath,
     showContainerRegistrySettings,
     showPackageRegistrySettings,
+    showDependencyProxySettings,
   } = el.dataset;
   return new Vue({
     el,
@@ -40,6 +41,7 @@ export default () => {
       helpPagePath,
       showContainerRegistrySettings: parseBoolean(showContainerRegistrySettings),
       showPackageRegistrySettings: parseBoolean(showPackageRegistrySettings),
+      showDependencyProxySettings: parseBoolean(showDependencyProxySettings),
     },
     render(createElement) {
       return createElement('registry-settings-app', {});
diff --git a/app/models/deploy_token.rb b/app/models/deploy_token.rb
index 920321a1699..1ab603b5ddf 100644
--- a/app/models/deploy_token.rb
+++ b/app/models/deploy_token.rb
@@ -6,13 +6,14 @@ class DeployToken < ApplicationRecord
   include PolicyActor
   include Gitlab::Utils::StrongMemoize
 
-  add_authentication_token_field :token, encrypted: :required
-
   AVAILABLE_SCOPES = %i[read_repository read_registry write_registry
                         read_package_registry write_package_registry].freeze
   GITLAB_DEPLOY_TOKEN_NAME = 'gitlab-deploy-token'
+  DEPLOY_TOKEN_PREFIX = 'gldt-'
   REQUIRED_DEPENDENCY_PROXY_SCOPES = %i[read_registry write_registry].freeze
 
+  add_authentication_token_field :token, encrypted: :required, format_with_prefix: :prefix_for_deploy_token
+
   attribute :expires_at, default: -> { Forever.date }
 
   # Do NOT use this `user` for the authentication/authorization of the deploy tokens.
@@ -141,6 +142,10 @@ class DeployToken < ApplicationRecord
     write_attribute(:expires_at, value.presence || Forever.date)
   end
 
+  def prefix_for_deploy_token
+    DEPLOY_TOKEN_PREFIX
+  end
+
   private
 
   def expired?