Add latest changes from gitlab-org/gitlab@master

5 files changed, 9 insertions, 9 deletions

diff --git a/app/models/integrations/bamboo.rb b/app/models/integrations/bamboo.rb
index b4e97f0871e..fc5e6a88c2d 100644
--- a/app/models/integrations/bamboo.rb
+++ b/app/models/integrations/bamboo.rb
@@ -16,7 +16,7 @@ module Integrations
       help: -> { s_('BambooService|Bamboo build plan key.') },
       non_empty_password_title: -> { s_('BambooService|Enter new build key') },
       non_empty_password_help: -> { s_('BambooService|Leave blank to use your current build key.') },
-      placeholder: -> { s_('KEY') },
+      placeholder: -> { _('KEY') },
       required: true
 
     field :username,
diff --git a/app/models/integrations/confluence.rb b/app/models/integrations/confluence.rb
index c1c43af99bf..31e9a171d1b 100644
--- a/app/models/integrations/confluence.rb
+++ b/app/models/integrations/confluence.rb
@@ -10,7 +10,7 @@ module Integrations
     validate :validate_confluence_url_is_cloud, if: :activated?
 
     field :confluence_url,
-      title: -> { s_('Confluence Cloud Workspace URL') },
+      title: -> { _('Confluence Cloud Workspace URL') },
       placeholder: 'https://example.atlassian.net/wiki',
       required: true
 
diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb
index 27bed5d3f76..9f33b499f62 100644
--- a/app/models/integrations/datadog.rb
+++ b/app/models/integrations/datadog.rb
@@ -48,8 +48,8 @@ module Integrations
     field :archive_trace_events,
       storage: :attribute,
       type: 'checkbox',
-      title: -> { s_('Logs') },
-      checkbox_label: -> { s_('Enable logs collection') },
+      title: -> { _('Logs') },
+      checkbox_label: -> { _('Enable logs collection') },
       help: -> { s_('When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces.') }
 
     field :datadog_service,
diff --git a/app/models/integrations/mattermost.rb b/app/models/integrations/mattermost.rb
index dd1c98ee06b..e3c5c22ad3a 100644
--- a/app/models/integrations/mattermost.rb
+++ b/app/models/integrations/mattermost.rb
@@ -5,7 +5,7 @@ module Integrations
     include SlackMattermostNotifier
 
     def title
-      s_('Mattermost notifications')
+      _('Mattermost notifications')
     end
 
     def description
diff --git a/app/models/integrations/packagist.rb b/app/models/integrations/packagist.rb
index 7148de66aee..3973b492b6d 100644
--- a/app/models/integrations/packagist.rb
+++ b/app/models/integrations/packagist.rb
@@ -5,15 +5,15 @@ module Integrations
     include HasWebHook
 
     field :username,
-      title: -> { s_('Username') },
-      help: -> { s_('Enter your Packagist username.') },
+      title: -> { _('Username') },
+      help: -> { _('Enter your Packagist username.') },
       placeholder: '',
       required: true
 
     field :token,
       type: 'password',
-      title: -> { s_('Token') },
-      help: -> { s_('Enter your Packagist token.') },
+      title: -> { _('Token') },
+      help: -> { _('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.') },
       placeholder: '',