diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-12 00:32:09 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-15 00:00:12 +0000 |
commit | acd423c79d21761badec720f986f68a73aa41cba (patch) | |
tree | 0f265c98c42b1b5503d68e14c08566f3fa01f2ab | |
parent | 21352572f46677427af5c9e1642057f923e8ea54 (diff) | |
download | gitlab-ce-acd423c79d21761badec720f986f68a73aa41cba.tar.gz |
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
(cherry picked from commit c4798ba6ef419e94970fd34ac8ea52328bacffaa)
ebf772b4 Update url placeholder for the sentry config
-rw-r--r-- | app/views/projects/settings/operations/_error_tracking.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/jivl-update-placeholder-sentry-config.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 2 |
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 7a5633ca446..1782c9d5e4d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8026,7 +8026,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" |