Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/settings/operations/_error_tracking.html.haml

@@ -18,7 +18,7 @@
             = form.label :enabled, _('Active'), class: 'form-check-label'
           .form-group
             = form.label :api_url, _('Sentry API URL'), class: 'label-bold'
-            = form.url_field :api_url, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/')
+            = form.url_field :api_url, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/')
             %p.form-text.text-muted
               = _('Enter your Sentry API URL')
           .form-group

changelogs/unreleased/jivl-update-placeholder-sentry-config.yml

+---
+title: Update url placeholder for the sentry configuration page
+merge_request: 24338
+author:
+type: other

locale/gitlab.pot

@@ -10667,7 +10667,7 @@ msgstr ""
 msgid "here"
 msgstr ""
 
-msgid "http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/"
+msgid "http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/"
 msgstr ""
 
 msgid "https://your-bitbucket-server"