Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 7 insertions, 6 deletions

diff --git a/app/models/integrations/packagist.rb b/app/models/integrations/packagist.rb
index fda4822c19f..f91404dab23 100644
--- a/app/models/integrations/packagist.rb
+++ b/app/models/integrations/packagist.rb
@@ -6,14 +6,14 @@ module Integrations
     extend Gitlab::Utils::Override
 
     field :username,
-      title: -> { _('Username') },
+      title: -> { s_('Username') },
       help: -> { s_('Enter your Packagist username.') },
       placeholder: '',
       required: true
 
     field :token,
       type: 'password',
-      title: -> { _('Token') },
+      title: -> { s_('Token') },
       help: -> { s_('Enter your Packagist token.') },
       non_empty_password_title: -> { s_('ProjectService|Enter new token') },
       non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') },
@@ -21,10 +21,11 @@ module Integrations
       required: true
 
     field :server,
-      title: -> { _('Server (optional)') },
+      title: -> { s_('Server (optional)') },
       help: -> { s_('Enter your Packagist server. Defaults to https://packagist.org.') },
       placeholder: 'https://packagist.org',
-      exposes_secrets: true
+      exposes_secrets: true,
+      required: false
 
     validates :username, presence: true, if: :activated?
     validates :token, presence: true, if: :activated?
@@ -55,8 +56,8 @@ module Integrations
       begin
         result = execute(data)
         return { success: false, result: result[:message] } if result[:http_status] != 202
-      rescue StandardError => error
-        return { success: false, result: error }
+      rescue StandardError => e
+        return { success: false, result: e }
       end
 
       { success: true, result: result[:message] }