From 4bb797f25563205cf495f4dd5366e037e88831ab Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 24 Oct 2023 18:11:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/ci/sources/pipeline.rb | 2 +- app/models/integration.rb | 19 ++++++++--- app/models/integrations/apple_app_store.rb | 6 ++-- app/models/integrations/asana.rb | 6 ++-- app/models/integrations/assembla.rb | 4 +-- app/models/integrations/bamboo.rb | 6 ++-- app/models/integrations/base_chat_notification.rb | 4 --- app/models/integrations/base_slack_notification.rb | 2 +- app/models/integrations/bugzilla.rb | 6 ++-- app/models/integrations/buildkite.rb | 12 +++---- app/models/integrations/campfire.rb | 6 ++-- app/models/integrations/clickup.rb | 6 ++-- app/models/integrations/confluence.rb | 4 +-- app/models/integrations/custom_issue_tracker.rb | 6 ++-- app/models/integrations/datadog.rb | 6 ++-- app/models/integrations/discord.rb | 14 ++++---- app/models/integrations/drone_ci.rb | 12 +++---- app/models/integrations/emails_on_push.rb | 4 +-- app/models/integrations/ewm.rb | 6 ++-- app/models/integrations/external_wiki.rb | 14 ++++---- .../integrations/gitlab_slack_application.rb | 4 +-- app/models/integrations/google_play.rb | 6 ++-- app/models/integrations/hangouts_chat.rb | 6 ++-- app/models/integrations/harbor.rb | 26 +++++++-------- app/models/integrations/irker.rb | 38 +++++++++++----------- app/models/integrations/jenkins.rb | 6 ++-- app/models/integrations/jira.rb | 20 ++++++------ app/models/integrations/mattermost.rb | 6 ++-- .../integrations/mattermost_slash_commands.rb | 4 +-- app/models/integrations/microsoft_teams.rb | 6 ++-- app/models/integrations/mock_ci.rb | 4 +-- app/models/integrations/mock_monitoring.rb | 4 +-- app/models/integrations/packagist.rb | 4 +-- app/models/integrations/pipelines_email.rb | 4 +-- app/models/integrations/pivotaltracker.rb | 6 ++-- app/models/integrations/prometheus.rb | 4 +-- app/models/integrations/pumble.rb | 6 ++-- app/models/integrations/pushover.rb | 4 +-- app/models/integrations/redmine.rb | 6 ++-- app/models/integrations/shimo.rb | 4 +-- app/models/integrations/slack.rb | 4 +-- app/models/integrations/slack_slash_commands.rb | 4 +-- app/models/integrations/squash_tm.rb | 6 ++-- app/models/integrations/teamcity.rb | 6 ++-- app/models/integrations/telegram.rb | 6 ++-- app/models/integrations/unify_circuit.rb | 6 ++-- app/models/integrations/webex_teams.rb | 6 ++-- app/models/integrations/youtrack.rb | 6 ++-- app/models/integrations/zentao.rb | 8 ++--- 49 files changed, 185 insertions(+), 180 deletions(-) (limited to 'app/models') diff --git a/app/models/ci/sources/pipeline.rb b/app/models/ci/sources/pipeline.rb index 5b6946b04fd..475d57ee4c8 100644 --- a/app/models/ci/sources/pipeline.rb +++ b/app/models/ci/sources/pipeline.rb @@ -12,7 +12,7 @@ module Ci :pipeline_id_convert_to_bigint, :source_pipeline_id_convert_to_bigint ], remove_with: '16.6', remove_after: '2023-10-22' - columns_changing_default :partition_id + columns_changing_default :partition_id, :source_partition_id self.table_name = "ci_sources_pipelines" diff --git a/app/models/integration.rb b/app/models/integration.rb index b4408301c6d..9b268e10cc6 100644 --- a/app/models/integration.rb +++ b/app/models/integration.rb @@ -237,6 +237,18 @@ class Integration < ApplicationRecord end private_class_method :boolean_accessor + def self.title + raise NotImplementedError + end + + def self.description + raise NotImplementedError + end + + def self.help + # no-op + end + def self.to_param raise NotImplementedError end @@ -447,19 +459,18 @@ class Integration < ApplicationRecord end def title - # implement inside child + self.class.title end def description - # implement inside child + self.class.description end def help - # implement inside child + self.class.help end def to_param - # implement inside child self.class.to_param end diff --git a/app/models/integrations/apple_app_store.rb b/app/models/integrations/apple_app_store.rb index ef12fc6bf6f..f8fddf8a457 100644 --- a/app/models/integrations/apple_app_store.rb +++ b/app/models/integrations/apple_app_store.rb @@ -37,15 +37,15 @@ module Integrations title: -> { s_('AppleAppStore|Protected branches and tags only') }, checkbox_label: -> { s_('AppleAppStore|Only set variables on protected branches and tags') } - def title + def self.title 'Apple App Store Connect' end - def description + def self.description s_('AppleAppStore|Use GitLab to build and release an app in the Apple App Store.') end - def help + def self.help variable_list = [ 'APP_STORE_CONNECT_API_KEY_ISSUER_ID', 'APP_STORE_CONNECT_API_KEY_KEY_ID', diff --git a/app/models/integrations/asana.rb b/app/models/integrations/asana.rb index 77555996cd9..39407acd6c9 100644 --- a/app/models/integrations/asana.rb +++ b/app/models/integrations/asana.rb @@ -20,15 +20,15 @@ module Integrations title: -> { s_('Integrations|Restrict to branch (optional)') }, help: -> { s_('AsanaService|Comma-separated list of branches to be automatically inspected. Leave blank to include all branches.') } - def title + def self.title 'Asana' end - def description + def self.description s_('AsanaService|Add commit messages as comments to Asana tasks.') end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/asana'), target: '_blank', rel: 'noopener noreferrer' s_('Add commit messages as comments to Asana tasks. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/assembla.rb b/app/models/integrations/assembla.rb index 1d3616b4c3b..bbdd0e183f2 100644 --- a/app/models/integrations/assembla.rb +++ b/app/models/integrations/assembla.rb @@ -15,11 +15,11 @@ module Integrations exposes_secrets: true, placeholder: '' - def title + def self.title 'Assembla' end - def description + def self.description _('Manage projects.') end diff --git a/app/models/integrations/bamboo.rb b/app/models/integrations/bamboo.rb index 9f15532a0b0..9fe73f86be3 100644 --- a/app/models/integrations/bamboo.rb +++ b/app/models/integrations/bamboo.rb @@ -38,15 +38,15 @@ module Integrations attr_accessor :response - def title + def self.title s_('BambooService|Atlassian Bamboo') end - def description + def self.description s_('BambooService|Run CI/CD pipelines with Atlassian Bamboo.') end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bamboo'), diff --git a/app/models/integrations/base_chat_notification.rb b/app/models/integrations/base_chat_notification.rb index b75801335bd..167bc210349 100644 --- a/app/models/integrations/base_chat_notification.rb +++ b/app/models/integrations/base_chat_notification.rb @@ -136,10 +136,6 @@ module Integrations raise NotImplementedError end - def help - raise NotImplementedError - end - # With some integrations the webhook is already tied to a specific channel, # for others the channels are configurable for each event. def configurable_channels? diff --git a/app/models/integrations/base_slack_notification.rb b/app/models/integrations/base_slack_notification.rb index 09a0c9ba361..33dd9d9d387 100644 --- a/app/models/integrations/base_slack_notification.rb +++ b/app/models/integrations/base_slack_notification.rb @@ -36,7 +36,7 @@ module Integrations true end - def help + def self.help # noop end diff --git a/app/models/integrations/bugzilla.rb b/app/models/integrations/bugzilla.rb index 74e282f6848..3ca348e42a1 100644 --- a/app/models/integrations/bugzilla.rb +++ b/app/models/integrations/bugzilla.rb @@ -6,15 +6,15 @@ module Integrations validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated? - def title + def self.title 'Bugzilla' end - def description + def self.description s_("IssueTracker|Use Bugzilla as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bugzilla'), target: '_blank', rel: 'noopener noreferrer' s_("IssueTracker|Use Bugzilla as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/buildkite.rb b/app/models/integrations/buildkite.rb index 82a5142e8c2..aab0cdf2134 100644 --- a/app/models/integrations/buildkite.rb +++ b/app/models/integrations/buildkite.rb @@ -75,20 +75,20 @@ module Integrations "#{project_url}/builds?commit=#{sha}" end - def title + def self.title 'Buildkite' end - def description + def self.description 'Run CI/CD pipelines with Buildkite.' end - def self.to_param - 'buildkite' + def self.help + s_('ProjectService|Run CI/CD pipelines with Buildkite.') end - def help - s_('ProjectService|Run CI/CD pipelines with Buildkite.') + def self.to_param + 'buildkite' end def calculate_reactive_cache(sha, ref) diff --git a/app/models/integrations/campfire.rb b/app/models/integrations/campfire.rb index 8b5797a9d24..18268ed18f4 100644 --- a/app/models/integrations/campfire.rb +++ b/app/models/integrations/campfire.rb @@ -36,15 +36,15 @@ module Integrations placeholder: '123456', help: -> { s_('CampfireService|From the end of the room URL.') } - def title + def self.title 'Campfire' end - def description + def self.description 'Send notifications about push events to Campfire chat rooms.' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('api/integrations', anchor: 'campfire'), diff --git a/app/models/integrations/clickup.rb b/app/models/integrations/clickup.rb index 7cc05d41e14..25287b53300 100644 --- a/app/models/integrations/clickup.rb +++ b/app/models/integrations/clickup.rb @@ -10,15 +10,15 @@ module Integrations @reference_pattern ||= /((#|CU-)(?[a-z0-9]+)|(?[A-Z0-9_]{2,10}-\d+))\b/ end - def title + def self.title 'ClickUp' end - def description + def self.description s_("IssueTracker|Use Clickup as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/clickup'), target: '_blank', diff --git a/app/models/integrations/confluence.rb b/app/models/integrations/confluence.rb index eda8c37fc72..f97f1fd25c9 100644 --- a/app/models/integrations/confluence.rb +++ b/app/models/integrations/confluence.rb @@ -22,11 +22,11 @@ module Integrations 'confluence' end - def title + def self.title s_('ConfluenceService|Confluence Workspace') end - def description + def self.description s_('ConfluenceService|Link to a Confluence Workspace from the sidebar.') end diff --git a/app/models/integrations/custom_issue_tracker.rb b/app/models/integrations/custom_issue_tracker.rb index 3770e813eaa..fe0d01d60bd 100644 --- a/app/models/integrations/custom_issue_tracker.rb +++ b/app/models/integrations/custom_issue_tracker.rb @@ -6,15 +6,15 @@ module Integrations validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated? - def title + def self.title s_('IssueTracker|Custom issue tracker') end - def description + def self.description s_("IssueTracker|Use a custom issue tracker as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/custom_issue_tracker'), target: '_blank', rel: 'noopener noreferrer' s_('IssueTracker|Use a custom issue tracker that is not in the integration list. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb index b1f1361afcd..5682fc2b139 100644 --- a/app/models/integrations/datadog.rb +++ b/app/models/integrations/datadog.rb @@ -117,15 +117,15 @@ module Integrations # archive_trace is opt-in but we handle it with a more detailed field below end - def title + def self.title 'Datadog' end - def description + def self.description s_('DatadogIntegration|Trace your GitLab pipelines with Datadog.') end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( s_('DatadogIntegration|How do I set up this integration?'), Rails.application.routes.url_helpers.help_page_url('integration/datadog'), diff --git a/app/models/integrations/discord.rb b/app/models/integrations/discord.rb index 33b2b52fa62..7ce597389f0 100644 --- a/app/models/integrations/discord.rb +++ b/app/models/integrations/discord.rb @@ -21,23 +21,23 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title s_("DiscordService|Discord Notifications") end - def description + def self.description s_("DiscordService|Send notifications about project events to a Discord channel.") end - def self.to_param - "discord" - end - - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('How do I set up this service?'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/discord_notifications'), target: '_blank', rel: 'noopener noreferrer' s_('Send notifications about project events to a Discord channel. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end + def self.to_param + "discord" + end + def default_channel_placeholder s_('DiscordService|Override the default webhook (e.g. https://discord.com/api/webhooks/…)') end diff --git a/app/models/integrations/drone_ci.rb b/app/models/integrations/drone_ci.rb index f6a12c4bb1a..b59e504c98f 100644 --- a/app/models/integrations/drone_ci.rb +++ b/app/models/integrations/drone_ci.rb @@ -87,20 +87,20 @@ module Integrations "gitlab/#{project.full_path}/redirect/commits/#{sha}?branch=#{Addressable::URI.encode_component(ref.to_s)}") end - def title + def self.title 'Drone' end - def description + def self.description s_('ProjectService|Run CI/CD pipelines with Drone.') end - def self.to_param - 'drone_ci' + def self.help + s_('ProjectService|Run CI/CD pipelines with Drone.') end - def help - s_('ProjectService|Run CI/CD pipelines with Drone.') + def self.to_param + 'drone_ci' end override :hook_url diff --git a/app/models/integrations/emails_on_push.rb b/app/models/integrations/emails_on_push.rb index 144d1a07b04..77be8f5db45 100644 --- a/app/models/integrations/emails_on_push.rb +++ b/app/models/integrations/emails_on_push.rb @@ -39,11 +39,11 @@ module Integrations recipients.split.grep(Devise.email_regexp).uniq(&:downcase) end - def title + def self.title s_('EmailsOnPushService|Emails on push') end - def description + def self.description s_('EmailsOnPushService|Email the commits and diff of each push to a list of recipients.') end diff --git a/app/models/integrations/ewm.rb b/app/models/integrations/ewm.rb index 003c896704a..9d6f4c2a56c 100644 --- a/app/models/integrations/ewm.rb +++ b/app/models/integrations/ewm.rb @@ -10,15 +10,15 @@ module Integrations @reference_pattern ||= %r{(?\b(bug|task|work item|workitem|rtcwi|defect)\b\s+\d+)}i end - def title + def self.title 'EWM' end - def description + def self.description s_("IssueTracker|Use IBM Engineering Workflow Management as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/ewm'), target: '_blank', rel: 'noopener noreferrer' s_("IssueTracker|Use IBM Engineering Workflow Management as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/external_wiki.rb b/app/models/integrations/external_wiki.rb index acacab2528e..7408f86d231 100644 --- a/app/models/integrations/external_wiki.rb +++ b/app/models/integrations/external_wiki.rb @@ -11,24 +11,24 @@ module Integrations help: -> { s_('ExternalWikiService|Enter the URL to the external wiki.') }, required: true - def title + def self.title s_('ExternalWikiService|External wiki') end - def description + def self.description s_('ExternalWikiService|Link to an external wiki from the sidebar.') end - def self.to_param - 'external_wiki' - end - - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/wiki/index', anchor: 'link-an-external-wiki'), target: '_blank', rel: 'noopener noreferrer' s_('Link an external wiki from the project\'s sidebar. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end + def self.to_param + 'external_wiki' + end + def sections [ { diff --git a/app/models/integrations/gitlab_slack_application.rb b/app/models/integrations/gitlab_slack_application.rb index 2d520eaf7e7..d008a28a226 100644 --- a/app/models/integrations/gitlab_slack_application.rb +++ b/app/models/integrations/gitlab_slack_application.rb @@ -26,11 +26,11 @@ module Integrations update(active: !!slack_integration) end - def title + def self.title s_('Integrations|GitLab for Slack app') end - def description + def self.description s_('Integrations|Enable slash commands and notifications for a Slack workspace.') end diff --git a/app/models/integrations/google_play.rb b/app/models/integrations/google_play.rb index 5389e8dfa81..746f68fdc4c 100644 --- a/app/models/integrations/google_play.rb +++ b/app/models/integrations/google_play.rb @@ -32,15 +32,15 @@ module Integrations title: -> { s_('GooglePlayStore|Protected branches and tags only') }, checkbox_label: -> { s_('GooglePlayStore|Only set variables on protected branches and tags') } - def title + def self.title s_('GooglePlay|Google Play') end - def description + def self.description s_('GooglePlay|Use GitLab to build and release an app in Google Play.') end - def help + def self.help variable_list = [ 'SUPPLY_PACKAGE_NAME', 'SUPPLY_JSON_KEY_DATA' diff --git a/app/models/integrations/hangouts_chat.rb b/app/models/integrations/hangouts_chat.rb index 6e4753470a3..6a9d603e6e5 100644 --- a/app/models/integrations/hangouts_chat.rb +++ b/app/models/integrations/hangouts_chat.rb @@ -17,11 +17,11 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title 'Google Chat' end - def description + def self.description 'Send notifications from GitLab to a room in Google Chat.' end @@ -29,7 +29,7 @@ module Integrations 'hangouts_chat' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to(_('How do I set up a Google Chat webhook?'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/hangouts_chat'), target: '_blank', rel: 'noopener noreferrer') diff --git a/app/models/integrations/harbor.rb b/app/models/integrations/harbor.rb index 559e48afd10..cc570e49e36 100644 --- a/app/models/integrations/harbor.rb +++ b/app/models/integrations/harbor.rb @@ -32,34 +32,32 @@ module Integrations non_empty_password_help: -> { s_('HarborIntegration|Leave blank to use your current password.') }, required: true - def title + def self.title 'Harbor' end - def description + def self.description s_("HarborIntegration|Use Harbor as this project's container registry.") end - def help + def self.help s_("HarborIntegration|After the Harbor integration is activated, global variables `$HARBOR_USERNAME`, `$HARBOR_HOST`, `$HARBOR_OCI`, `$HARBOR_PASSWORD`, `$HARBOR_URL` and `$HARBOR_PROJECT` will be created for CI/CD use.") end + def self.to_param + name.demodulize.downcase + end + def hostname Gitlab::Utils.parse_url(url).hostname end - class << self - def to_param - name.demodulize.downcase - end - - def supported_events - [] - end + def self.supported_events + [] + end - def supported_event_actions - [] - end + def self.supported_event_actions + [] end def test(*_args) diff --git a/app/models/integrations/irker.rb b/app/models/integrations/irker.rb index a54946f074a..a1ce0877957 100644 --- a/app/models/integrations/irker.rb +++ b/app/models/integrations/irker.rb @@ -53,14 +53,31 @@ module Integrations # in the UI or API. prop_accessor :channels - def title + def self.title s_('IrkerService|irker (IRC gateway)') end - def description + def self.description s_('IrkerService|Send update messages to an irker server.') end + def self.help + docs_link = ActionController::Base.helpers.link_to( + _('Learn more.'), + Rails.application.routes.url_helpers.help_page_url( + 'user/project/integrations/irker', + anchor: 'set-up-an-irker-daemon' + ), + target: '_blank', + rel: 'noopener noreferrer' + ) + + format(s_( + 'IrkerService|Send update messages to an irker server. ' \ + 'Before you can use this, you need to set up the irker daemon. %{docs_link}' + ).html_safe, docs_link: docs_link.html_safe) + end + def self.to_param 'irker' end @@ -85,23 +102,6 @@ module Integrations } end - def help - docs_link = ActionController::Base.helpers.link_to( - _('Learn more.'), - Rails.application.routes.url_helpers.help_page_url( - 'user/project/integrations/irker', - anchor: 'set-up-an-irker-daemon' - ), - target: '_blank', - rel: 'noopener noreferrer' - ) - - format(s_( - 'IrkerService|Send update messages to an irker server. ' \ - 'Before you can use this, you need to set up the irker daemon. %{docs_link}' - ).html_safe, docs_link: docs_link.html_safe) - end - private def get_channels diff --git a/app/models/integrations/jenkins.rb b/app/models/integrations/jenkins.rb index 0683c8408bc..a2f5667eaee 100644 --- a/app/models/integrations/jenkins.rb +++ b/app/models/integrations/jenkins.rb @@ -69,15 +69,15 @@ module Integrations %w[push merge_request tag_push] end - def title + def self.title 'Jenkins' end - def description + def self.description s_('Run CI/CD pipelines with Jenkins.') end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('integration/jenkins'), target: '_blank', rel: 'noopener noreferrer' s_('Run CI/CD pipelines with Jenkins when you push to a repository, or when a merge request is created, updated, or merged. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb index f6e99454cb1..37735b956fc 100644 --- a/app/models/integrations/jira.rb +++ b/app/models/integrations/jira.rb @@ -191,9 +191,17 @@ module Integrations end end - def help + def self.title + 'Jira' + end + + def self.description + s_("JiraService|Use Jira as this project's issue tracker.") + end + + def self.help jira_doc_link_start = format(''.html_safe, - url: help_page_path('integration/jira/index')) + url: Gitlab::Routing.url_helpers.help_page_path('integration/jira/index')) format( s_("JiraService|You must configure Jira before enabling this integration. " \ "%{jira_doc_link_start}Learn more.%{link_end}"), @@ -201,14 +209,6 @@ module Integrations link_end: ''.html_safe) end - def title - 'Jira' - end - - def description - s_("JiraService|Use Jira as this project's issue tracker.") - end - def self.to_param 'jira' end diff --git a/app/models/integrations/mattermost.rb b/app/models/integrations/mattermost.rb index 7e391b11d82..361ff4afce8 100644 --- a/app/models/integrations/mattermost.rb +++ b/app/models/integrations/mattermost.rb @@ -5,11 +5,11 @@ module Integrations include SlackMattermostNotifier include SlackMattermostFields - def title + def self.title _('Mattermost notifications') end - def description + def self.description s_('Send notifications about project events to Mattermost channels.') end @@ -17,7 +17,7 @@ module Integrations 'mattermost' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/mattermost'), target: '_blank', rel: 'noopener noreferrer' s_('Send notifications about project events to Mattermost channels. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/mattermost_slash_commands.rb b/app/models/integrations/mattermost_slash_commands.rb index 73cddd163e0..9554dec4168 100644 --- a/app/models/integrations/mattermost_slash_commands.rb +++ b/app/models/integrations/mattermost_slash_commands.rb @@ -14,11 +14,11 @@ module Integrations false end - def title + def self.title s_('Integrations|Mattermost slash commands') end - def description + def self.description s_('Integrations|Perform common tasks with slash commands.') end diff --git a/app/models/integrations/microsoft_teams.rb b/app/models/integrations/microsoft_teams.rb index 208172d6303..3a7c848d411 100644 --- a/app/models/integrations/microsoft_teams.rb +++ b/app/models/integrations/microsoft_teams.rb @@ -18,11 +18,11 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title 'Microsoft Teams notifications' end - def description + def self.description 'Send notifications about project events to Microsoft Teams.' end @@ -30,7 +30,7 @@ module Integrations 'microsoft_teams' end - def help + def self.help '

Use this service to send notifications about events in GitLab projects to your Microsoft Teams channels. How do I configure this integration?

' end diff --git a/app/models/integrations/mock_ci.rb b/app/models/integrations/mock_ci.rb index 2d8e26d409f..9c129ca727c 100644 --- a/app/models/integrations/mock_ci.rb +++ b/app/models/integrations/mock_ci.rb @@ -14,11 +14,11 @@ module Integrations validates :mock_service_url, presence: true, public_url: true, if: :activated? - def title + def self.title 'MockCI' end - def description + def self.description 'Mock an external CI' end diff --git a/app/models/integrations/mock_monitoring.rb b/app/models/integrations/mock_monitoring.rb index 72bb292edaa..9e474078b28 100644 --- a/app/models/integrations/mock_monitoring.rb +++ b/app/models/integrations/mock_monitoring.rb @@ -2,11 +2,11 @@ module Integrations class MockMonitoring < BaseMonitoring - def title + def self.title 'Mock monitoring' end - def description + def self.description 'Mock monitoring service' end diff --git a/app/models/integrations/packagist.rb b/app/models/integrations/packagist.rb index c0acb6c87b4..f027afe0381 100644 --- a/app/models/integrations/packagist.rb +++ b/app/models/integrations/packagist.rb @@ -29,11 +29,11 @@ module Integrations validates :username, presence: true, if: :activated? validates :token, presence: true, if: :activated? - def title + def self.title 'Packagist' end - def description + def self.description s_('Integrations|Keep your PHP dependencies updated on Packagist.') end diff --git a/app/models/integrations/pipelines_email.rb b/app/models/integrations/pipelines_email.rb index 01efbc3e4a4..c7a93d48825 100644 --- a/app/models/integrations/pipelines_email.rb +++ b/app/models/integrations/pipelines_email.rb @@ -44,11 +44,11 @@ module Integrations end end - def title + def self.title _('Pipeline status emails') end - def description + def self.description _('Email the pipeline status to a list of recipients.') end diff --git a/app/models/integrations/pivotaltracker.rb b/app/models/integrations/pivotaltracker.rb index b3cbc988dd6..97e6e3e09d1 100644 --- a/app/models/integrations/pivotaltracker.rb +++ b/app/models/integrations/pivotaltracker.rb @@ -20,15 +20,15 @@ module Integrations 'automatically inspect. Leave blank to include all branches.') end - def title + def self.title 'Pivotal Tracker' end - def description + def self.description s_('PivotalTrackerService|Add commit messages as comments to Pivotal Tracker stories.') end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/pivotal_tracker'), target: '_blank', rel: 'noopener noreferrer' s_('Add commit messages as comments to Pivotal Tracker stories. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/prometheus.rb b/app/models/integrations/prometheus.rb index ff8d07a1b4c..de923bbbdd5 100644 --- a/app/models/integrations/prometheus.rb +++ b/app/models/integrations/prometheus.rb @@ -51,11 +51,11 @@ module Integrations false end - def title + def self.title 'Prometheus' end - def description + def self.description s_('PrometheusService|Monitor application health with Prometheus metrics and dashboards') end diff --git a/app/models/integrations/pumble.rb b/app/models/integrations/pumble.rb index 09e011023ed..36ff5189b0f 100644 --- a/app/models/integrations/pumble.rb +++ b/app/models/integrations/pumble.rb @@ -18,11 +18,11 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title 'Pumble' end - def description + def self.description s_("PumbleIntegration|Send notifications about project events to Pumble.") end @@ -30,7 +30,7 @@ module Integrations 'pumble' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/pumble'), diff --git a/app/models/integrations/pushover.rb b/app/models/integrations/pushover.rb index 2feae29f627..b2c4e06e71f 100644 --- a/app/models/integrations/pushover.rb +++ b/app/models/integrations/pushover.rb @@ -71,11 +71,11 @@ module Integrations ] end - def title + def self.title 'Pushover' end - def description + def self.description s_('PushoverService|Get real-time notifications on your device.') end diff --git a/app/models/integrations/redmine.rb b/app/models/integrations/redmine.rb index bc2a64b0848..11eda7c69f7 100644 --- a/app/models/integrations/redmine.rb +++ b/app/models/integrations/redmine.rb @@ -6,15 +6,15 @@ module Integrations validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated? - def title + def self.title 'Redmine' end - def description + def self.description s_("IssueTracker|Use Redmine as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/redmine'), target: '_blank', rel: 'noopener noreferrer' s_('IssueTracker|Use Redmine as the issue tracker. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/shimo.rb b/app/models/integrations/shimo.rb index 227fdca5c91..1d004356469 100644 --- a/app/models/integrations/shimo.rb +++ b/app/models/integrations/shimo.rb @@ -16,11 +16,11 @@ module Integrations valid? && activated? end - def title + def self.title s_('Shimo|Shimo') end - def description + def self.description s_('Shimo|Link to a Shimo Workspace from the sidebar.') end diff --git a/app/models/integrations/slack.rb b/app/models/integrations/slack.rb index f70376e2f0d..9f9614a84fd 100644 --- a/app/models/integrations/slack.rb +++ b/app/models/integrations/slack.rb @@ -5,11 +5,11 @@ module Integrations include SlackMattermostNotifier include SlackMattermostFields - def title + def self.title 'Slack notifications' end - def description + def self.description 'Send notifications about project events to Slack.' end diff --git a/app/models/integrations/slack_slash_commands.rb b/app/models/integrations/slack_slash_commands.rb index b209f37ee7c..c5ea6f22951 100644 --- a/app/models/integrations/slack_slash_commands.rb +++ b/app/models/integrations/slack_slash_commands.rb @@ -10,11 +10,11 @@ module Integrations non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current token.') }, placeholder: '' - def title + def self.title 'Slack slash commands' end - def description + def self.description "Perform common operations in Slack." end diff --git a/app/models/integrations/squash_tm.rb b/app/models/integrations/squash_tm.rb index bf3f391564f..1b4ab152b1d 100644 --- a/app/models/integrations/squash_tm.rb +++ b/app/models/integrations/squash_tm.rb @@ -22,15 +22,15 @@ module Integrations validates :token, length: { maximum: 255 }, allow_blank: true end - def title + def self.title 'Squash TM' end - def description + def self.description s_("SquashTmIntegration|Update Squash TM requirements when GitLab issues are modified.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/squash_tm'), diff --git a/app/models/integrations/teamcity.rb b/app/models/integrations/teamcity.rb index 575c3b8a334..913242ef9ac 100644 --- a/app/models/integrations/teamcity.rb +++ b/app/models/integrations/teamcity.rb @@ -47,15 +47,15 @@ module Integrations end end - def title + def self.title 'JetBrains TeamCity' end - def description + def self.description s_('ProjectService|Run CI/CD pipelines with JetBrains TeamCity.') end - def help + def self.help s_('To run CI/CD pipelines with JetBrains TeamCity, input the GitLab project details in the TeamCity project Version Control Settings.') end diff --git a/app/models/integrations/telegram.rb b/app/models/integrations/telegram.rb index 71fe6f8d6ef..8eb1a7ad0ea 100644 --- a/app/models/integrations/telegram.rb +++ b/app/models/integrations/telegram.rb @@ -38,11 +38,11 @@ module Integrations before_validation :set_webhook - def title + def self.title 'Telegram' end - def description + def self.description s_("TelegramIntegration|Send notifications about project events to Telegram.") end @@ -50,7 +50,7 @@ module Integrations 'telegram' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to( _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/telegram'), diff --git a/app/models/integrations/unify_circuit.rb b/app/models/integrations/unify_circuit.rb index 3b4bcfa28d3..6ee95c1173b 100644 --- a/app/models/integrations/unify_circuit.rb +++ b/app/models/integrations/unify_circuit.rb @@ -17,11 +17,11 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title 'Unify Circuit' end - def description + def self.description s_('Integrations|Send notifications about project events to Unify Circuit.') end @@ -29,7 +29,7 @@ module Integrations 'unify_circuit' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('How do I set up this service?'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/unify_circuit'), target: '_blank', rel: 'noopener noreferrer' s_('Integrations|Send notifications about project events to a Unify Circuit conversation. %{docs_link}').html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/webex_teams.rb b/app/models/integrations/webex_teams.rb index 3ef8ab39352..5f8cc195544 100644 --- a/app/models/integrations/webex_teams.rb +++ b/app/models/integrations/webex_teams.rb @@ -17,11 +17,11 @@ module Integrations title: -> { s_('Integrations|Branches for which notifications are to be sent') }, choices: -> { branch_choices } - def title + def self.title s_("WebexTeamsService|Webex Teams") end - def description + def self.description s_("WebexTeamsService|Send notifications about project events to Webex Teams.") end @@ -29,7 +29,7 @@ module Integrations 'webex_teams' end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/webex_teams'), target: '_blank', rel: 'noopener noreferrer' s_("WebexTeamsService|Send notifications about project events to a Webex Teams conversation. %{docs_link}") % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/youtrack.rb b/app/models/integrations/youtrack.rb index 15246a37aa7..932e588a829 100644 --- a/app/models/integrations/youtrack.rb +++ b/app/models/integrations/youtrack.rb @@ -14,15 +14,15 @@ module Integrations @reference_pattern = /(?\b[A-Za-z][A-Za-z0-9_]*-\d+\b)#{regex_suffix if only_long}/ end - def title + def self.title 'YouTrack' end - def description + def self.description s_("IssueTracker|Use YouTrack as this project's issue tracker.") end - def help + def self.help docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/youtrack'), target: '_blank', rel: 'noopener noreferrer' s_("IssueTracker|Use YouTrack as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe } end diff --git a/app/models/integrations/zentao.rb b/app/models/integrations/zentao.rb index 58ec4abf30c..2aec0c1e871 100644 --- a/app/models/integrations/zentao.rb +++ b/app/models/integrations/zentao.rb @@ -57,18 +57,18 @@ module Integrations data_fields.api_url ||= issues_tracker['api_url'] end - def title + def self.title 'ZenTao' end - def description + def self.description s_("ZentaoIntegration|Use ZenTao as this project's issue tracker.") end - def help + def self.help s_("ZentaoIntegration|Before you enable this integration, you must configure ZenTao. For more details, read the %{link_start}ZenTao integration documentation%{link_end}.") % { link_start: '' - .html_safe % { url: help_page_url('user/project/integrations/zentao') }, + .html_safe % { url: Rails.application.routes.url_helpers.help_page_url('user/project/integrations/zentao') }, link_end: ''.html_safe } end -- cgit v1.2.3