Commit f6978c5d authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ui-text-ci-integrations' into 'master'

Update UI text in CI integrations

See merge request gitlab-org/gitlab!60352
parents f921f8a5 8cf52920
......@@ -36,12 +36,12 @@ class BambooService < CiService
end
def description
s_('BambooService|Use the Atlassian Bamboo CI/CD server with GitLab.')
s_('BambooService|Run CI/CD pipelines with Atlassian Bamboo.')
end
def help
docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bamboo'), target: '_blank', rel: 'noopener noreferrer'
s_('BambooService|Use Atlassian Bamboo to run CI/CD pipelines. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
s_('BambooService|Run CI/CD pipelines with Atlassian Bamboo. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
end
def self.to_param
......
......@@ -64,12 +64,12 @@ class JenkinsService < CiService
end
def description
s_('An extendable open source CI/CD server.')
s_('Run CI/CD pipelines with Jenkins.')
end
def help
docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('integration/jenkins'), target: '_blank', rel: 'noopener noreferrer'
s_('Trigger Jenkins builds 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 }
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
def self.to_param
......
---
title: Align UI text for CI integrations with each other
merge_request: 60352
author:
type: other
......@@ -3736,9 +3736,6 @@ msgstr ""
msgid "An example showing how to use Jsonnet with GitLab dynamic child pipelines"
msgstr ""
msgid "An extendable open source CI/CD server."
msgstr ""
msgid "An instance-level serverless domain already exists."
msgstr ""
......@@ -4917,13 +4914,13 @@ msgstr ""
msgid "BambooService|Bamboo service root URL."
msgstr ""
msgid "BambooService|The user with API access to the Bamboo server."
msgid "BambooService|Run CI/CD pipelines with Atlassian Bamboo."
msgstr ""
msgid "BambooService|Use Atlassian Bamboo to run CI/CD pipelines. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}"
msgid "BambooService|Run CI/CD pipelines with Atlassian Bamboo. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}"
msgstr ""
msgid "BambooService|Use the Atlassian Bamboo CI/CD server with GitLab."
msgid "BambooService|The user with API access to the Bamboo server."
msgstr ""
msgid "Based on"
......@@ -27648,6 +27645,12 @@ msgstr ""
msgid "Run CI/CD pipelines for external repositories"
msgstr ""
msgid "Run CI/CD pipelines with Jenkins when you push to a repository, or when a merge request is created, updated, or merged. %{docs_link}"
msgstr ""
msgid "Run CI/CD pipelines with Jenkins."
msgstr ""
msgid "Run housekeeping"
msgstr ""
......@@ -33719,9 +33722,6 @@ msgstr ""
msgid "Trigger"
msgstr ""
msgid "Trigger Jenkins builds when you push to a repository, or when a merge request is created, updated, or merged. %{docs_link}"
msgstr ""
msgid "Trigger a pipeline for a branch or tag by generating a trigger token and using it with an API call. The token impersonates a user's project access and permissions."
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment