aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web
diff options
context:
space:
mode:
authorAntoine Vigneau <antoine.vigneau@sonarsource.com>2024-03-19 11:58:22 +0100
committersonartech <sonartech@sonarsource.com>2024-03-20 20:02:43 +0000
commit0ae8d1634c2369bc24e71d2f46e6193c0db5caa4 (patch)
tree9c03df0836c89351405f20018ac5f5aff337f791 /server/sonar-web
parent4eec8f1729f8566b9c553d17b09801ba15cccc36 (diff)
downloadsonarqube-0ae8d1634c2369bc24e71d2f46e6193c0db5caa4.tar.gz
sonarqube-0ae8d1634c2369bc24e71d2f46e6193c0db5caa4.zip
SONAR-21879 Fix SSF-568
Diffstat (limited to 'server/sonar-web')
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx11
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap15
2 files changed, 12 insertions, 14 deletions
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
index 3bc4c0bbf36..946974835ec 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
@@ -47,11 +47,12 @@ export default function BitbucketServerForm(props: BitbucketServerFormProps) {
/>
<AlmBindingDefinitionFormField
help={
- <FormattedMessage
- defaultMessage={translate('settings.almintegration.form.url.bitbucket.help')}
- id="settings.almintegration.form.url.bitbucket.help"
- values={{ example: 'https://bitbucket-server.your-company.com' }}
- />
+ <>
+ {translate('settings.almintegration.form.url.bitbucket.help')}
+ <br />
+ <br />
+ {translate('settings.almintegration.form.url.bitbucket.pat_warning')}
+ </>
}
id="url.bitbucket"
maxLength={2000}
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
index c937fdb2eb8..7b392e018eb 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
@@ -13,15 +13,12 @@ exports[`should render correctly 1`] = `
/>
<AlmBindingDefinitionFormField
help={
- <FormattedMessage
- defaultMessage="settings.almintegration.form.url.bitbucket.help"
- id="settings.almintegration.form.url.bitbucket.help"
- values={
- {
- "example": "https://bitbucket-server.your-company.com",
- }
- }
- />
+ <React.Fragment>
+ settings.almintegration.form.url.bitbucket.help
+ <br />
+ <br />
+ settings.almintegration.form.url.bitbucket.pat_warning
+ </React.Fragment>
}
id="url.bitbucket"
maxLength={2000}