summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Vargas <jvargas@gitlab.com>2019-01-11 17:04:07 -0600
committerJose Vargas <jvargas@gitlab.com>2019-01-11 17:36:06 -0600
commitebf772b4dbd7c5e05a91867e049e325b4013247d (patch)
tree72dfaa4e45a7f5e9728ce71976895d95722b9e87
parentf5dd9107363b7376325712f973339c7fde036ef2 (diff)
downloadgitlab-ce-ebf772b4dbd7c5e05a91867e049e325b4013247d.tar.gz
Update url placeholder for the sentry config
-rw-r--r--app/views/projects/settings/operations/_error_tracking.html.haml2
-rw-r--r--changelogs/unreleased/jivl-update-placeholder-sentry-config.yml5
-rw-r--r--locale/gitlab.pot2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/settings/operations/_error_tracking.html.haml b/app/views/projects/settings/operations/_error_tracking.html.haml
index 71335e4dfd0..871b60f05ba 100644
--- a/app/views/projects/settings/operations/_error_tracking.html.haml
+++ b/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
diff --git a/changelogs/unreleased/jivl-update-placeholder-sentry-config.yml b/changelogs/unreleased/jivl-update-placeholder-sentry-config.yml
new file mode 100644
index 00000000000..eb860fd3905
--- /dev/null
+++ b/changelogs/unreleased/jivl-update-placeholder-sentry-config.yml
@@ -0,0 +1,5 @@
+---
+title: Update url placeholder for the sentry configuration page
+merge_request: 24338
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d3f20a4620f..e7aa7e453bd 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8098,7 +8098,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"