Merge branch 'jivl-update-placeholder-sentry-config' into 'master'

Update url placeholder for the sentry configuration page

Closes #56276

See merge request gitlab-org/gitlab-ce!24338
This commit is contained in:
Clement Ho 2019-01-12 00:32:09 +00:00
commit c4798ba6ef
3 changed files with 7 additions and 2 deletions

View file

@ -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

View file

@ -0,0 +1,5 @@
---
title: Update url placeholder for the sentry configuration page
merge_request: 24338
author:
type: other

View file

@ -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"