Commit a74d08ad authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'ui-text-jenkins' into 'master'

Update UI text for Jenkins integration

See merge request gitlab-org/gitlab!58623
parents 480009d9 51b1403a
# frozen_string_literal: true
class JenkinsService < CiService
include ActionView::Helpers::UrlHelper
prop_accessor :jenkins_url, :project_name, :username, :password
before_update :reset_password
......@@ -58,15 +60,16 @@ class JenkinsService < CiService
end
def title
'Jenkins CI'
'Jenkins'
end
def description
'An extendable open source continuous integration server'
s_('An extendable open source CI/CD server.')
end
def help
"You must have installed the Git Plugin and GitLab Plugin in Jenkins. [More information](#{Gitlab::Routing.url_helpers.help_page_url('integration/jenkins')})"
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 }
end
def self.to_param
......@@ -78,27 +81,30 @@ class JenkinsService < CiService
{
type: 'text',
name: 'jenkins_url',
title: s_('ProjectService|Jenkins URL'),
title: s_('ProjectService|Jenkins server URL'),
required: true,
placeholder: 'Jenkins URL like http://jenkins.example.com'
placeholder: 'http://jenkins.example.com',
help: s_('The URL of the Jenkins server.')
},
{
type: 'text',
name: 'project_name',
required: true,
placeholder: 'Project Name',
help: 'The URL-friendly project name. Example: my_project_name'
placeholder: 'my_project_name',
help: s_('The name of the Jenkins project. Copy the name from the end of the URL to the project.')
},
{
type: 'text',
name: 'username',
required: true
required: true,
help: s_('The username for the Jenkins server.')
},
{
type: 'password',
name: 'password',
non_empty_password_title: s_('ProjectService|Enter new password'),
non_empty_password_help: s_('ProjectService|Leave blank to use your current password')
help: s_('The password for the Jenkins server.'),
non_empty_password_title: s_('ProjectService|Enter new password.'),
non_empty_password_help: s_('ProjectService|Leave blank to use your current password.')
}
]
end
......
---
title: Update UI text of Jenkins integration
merge_request: 58623
author:
type: other
......@@ -3680,6 +3680,9 @@ 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 ""
......@@ -24206,10 +24209,13 @@ msgstr ""
msgid "ProjectService|Enter new password"
msgstr ""
msgid "ProjectService|Enter new password."
msgstr ""
msgid "ProjectService|Issue URL"
msgstr ""
msgid "ProjectService|Jenkins URL"
msgid "ProjectService|Jenkins server URL"
msgstr ""
msgid "ProjectService|Leave blank to use your current API key"
......@@ -24218,6 +24224,9 @@ msgstr ""
msgid "ProjectService|Leave blank to use your current password"
msgstr ""
msgid "ProjectService|Leave blank to use your current password."
msgstr ""
msgid "ProjectService|Mock service URL"
msgstr ""
......@@ -30385,6 +30394,9 @@ msgstr ""
msgid "The URL defined on the primary node that secondary nodes should use to contact it. %{linkStart}More information%{linkEnd}"
msgstr ""
msgid "The URL of the Jenkins server."
msgstr ""
msgid "The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., \"http://localhost:9200, http://localhost:9201\")."
msgstr ""
......@@ -30621,6 +30633,9 @@ msgstr ""
msgid "The name of the CI/CD configuration file. A path relative to the root directory is optional (for example %{code_open}my/path/.myfile.yml%{code_close})."
msgstr ""
msgid "The name of the Jenkins project. Copy the name from the end of the URL to the project."
msgstr ""
msgid "The number of changes to fetch from GitLab when cloning a repository. Lower values can speed up pipeline execution. Set to %{code_open}0%{code_close} or blank to fetch all branches and tags for each job"
msgstr ""
......@@ -30639,6 +30654,9 @@ msgstr ""
msgid "The passphrase required to decrypt the private key. This is optional and the value is encrypted at rest."
msgstr ""
msgid "The password for the Jenkins server."
msgstr ""
msgid "The phase of the development lifecycle."
msgstr ""
......@@ -30783,6 +30801,9 @@ msgstr ""
msgid "The user you are trying to deactivate has been active in the past %{minimum_inactive_days} days and cannot be deactivated"
msgstr ""
msgid "The username for the Jenkins server."
msgstr ""
msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
msgstr ""
......@@ -32484,6 +32505,9 @@ 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 ""
......
......@@ -12,7 +12,7 @@ RSpec.describe 'Disable individual triggers', :js do
end
context 'service has multiple supported events' do
let(:service_name) { 'Jenkins CI' }
let(:service_name) { 'Jenkins' }
it 'shows trigger checkboxes' do
event_count = JenkinsService.supported_events.count
......
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