Commit 15bea796 authored by Marcel Amirault's avatar Marcel Amirault

Update UI text for TeamCity integration

Externalize strings, clarify items, add help
text, etc
parent c4a90367
......@@ -51,16 +51,15 @@ class TeamcityService < CiService
end
def title
'JetBrains TeamCity CI'
'JetBrains TeamCity'
end
def description
'A continuous integration and build server'
s_('ProjectService|Run CI/CD pipelines with JetBrains TeamCity.')
end
def help
'You will want to configure monitoring of all branches so merge '\
'requests build, that setting is in the vsc root advanced settings.'
s_('To run CI/CD pipelines with JetBrains TeamCity, input the GitLab project details in the TeamCity project Version Control Settings.')
end
def fields
......@@ -68,20 +67,20 @@ class TeamcityService < CiService
{
type: 'text',
name: 'teamcity_url',
title: s_('ProjectService|TeamCity URL'),
placeholder: 'TeamCity root URL like https://teamcity.example.com',
title: s_('ProjectService|TeamCity server URL'),
placeholder: 'https://teamcity.example.com',
required: true
},
{
type: 'text',
name: 'build_type',
placeholder: 'Build configuration ID',
help: s_('ProjectService|The build configuration ID of the TeamCity project.'),
required: true
},
{
type: 'text',
name: 'username',
placeholder: 'A user with permissions to trigger a manual build'
help: s_('ProjectService|Must have permission to trigger a manual build in TeamCity.')
},
{
type: 'password',
......
---
title: Update UI text for TeamCity integration
merge_request: 59493
author:
type: other
......@@ -24635,6 +24635,9 @@ msgstr ""
msgid "ProjectService|Mock service URL"
msgstr ""
msgid "ProjectService|Must have permission to trigger a manual build in TeamCity."
msgstr ""
msgid "ProjectService|New issue URL"
msgstr ""
......@@ -24644,7 +24647,13 @@ msgstr ""
msgid "ProjectService|Run CI/CD pipelines with Drone."
msgstr ""
msgid "ProjectService|TeamCity URL"
msgid "ProjectService|Run CI/CD pipelines with JetBrains TeamCity."
msgstr ""
msgid "ProjectService|TeamCity server URL"
msgstr ""
msgid "ProjectService|The build configuration ID of the TeamCity project."
msgstr ""
msgid "ProjectService|To configure this integration, you should:"
......@@ -32728,6 +32737,9 @@ msgstr ""
msgid "To receive alerts from manually configured Prometheus services, add the following URL and Authorization key to your Prometheus webhook config file. Learn more about %{linkStart}configuring Prometheus%{linkEnd} to send alerts to GitLab."
msgstr ""
msgid "To run CI/CD pipelines with JetBrains TeamCity, input the GitLab project details in the TeamCity project Version Control Settings."
msgstr ""
msgid "To see all the user's personal access tokens you must impersonate them first."
msgstr ""
......
......@@ -10,16 +10,16 @@ RSpec.describe 'User activates JetBrains TeamCity CI' do
end
it 'activates service', :js do
visit_project_integration('JetBrains TeamCity CI')
visit_project_integration('JetBrains TeamCity')
check('Push')
check('Merge Request')
fill_in('TeamCity URL', with: 'http://teamcity.example.com')
fill_in('TeamCity server URL', with: 'http://teamcity.example.com')
fill_in('Build type', with: 'GitlabTest_Build')
fill_in('Username', with: 'user')
fill_in('Password', with: 'verySecret')
click_test_then_save_integration(expect_test_to_fail: false)
expect(page).to have_content('JetBrains TeamCity CI settings saved and active.')
expect(page).to have_content('JetBrains TeamCity settings saved and active.')
end
end
......@@ -5816,7 +5816,7 @@ RSpec.describe Project, factory_default: :keep do
services = subject.find_or_initialize_services
expect(services.size).to eq(2)
expect(services.map(&:title)).to eq(['JetBrains TeamCity CI', 'Pushover'])
expect(services.map(&:title)).to eq(['JetBrains TeamCity', 'Pushover'])
end
end
end
......
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