Merge branch 'sentry-url-helper-text' into 'master'

Add new help text to sentry settings

Closes #34058

See merge request gitlab-org/gitlab!20663

app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue

@@ -32,12 +32,16 @@ export default {
             placeholder="https://mysentryserver.com"
             @input="updateApiHost"
           />
+          <p class="form-text text-muted">
+            {{
+              s__(
+                "ErrorTracking|If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io",
+              )
+            }}
+          </p>
           <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings -->
         </div>
       </div>
-      <p class="form-text text-muted">
-        {{ s__('ErrorTracking|Find your hostname in your Sentry account settings page') }}
-      </p>
     </div>
     <div class="form-group" :class="{ 'gl-show-field-errors': connectError }">
       <label class="label-bold" for="error-tracking-token">

changelogs/unreleased/sentry-url-helper-text.yml

+---
+title: Update helper text for sentry error tracking settings
+merge_request: 20663
+author: Rajendra Kadam
+type: added

locale/gitlab.pot

@@ -6993,7 +6993,7 @@ msgstr ""
 msgid "ErrorTracking|Connection has failed. Re-check Auth Token and try again."
 msgstr ""
 
-msgid "ErrorTracking|Find your hostname in your Sentry account settings page"
+msgid "ErrorTracking|If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io"
 msgstr ""
 
 msgid "ErrorTracking|No projects available"

spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js

@@ -49,7 +49,9 @@ describe('error tracking settings form', () => {
     it('is rendered with labels and placeholders', () => {
       const pageText = wrapper.text();
 
-      expect(pageText).toContain('Find your hostname in your Sentry account settings page');
+      expect(pageText).toContain(
+        "If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io",
+      );
       expect(pageText).toContain(
         "After adding your Auth Token, use the 'Connect' button to load projects",
       );