diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-12 00:32:09 +0000 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-01-12 12:27:58 +0100 |
| commit | 6f26e5209dce0ec0fe537c366a25a73e9e3ef4a4 (patch) | |
| tree | 830179d91671ffd3cf65af7abb895a216245f5fa | |
| parent | 8885acdf6f3a62d8d7befb76403ce5ce160e147f (diff) | |
| download | gitlab-ce-6f26e5209dce0ec0fe537c366a25a73e9e3ef4a4.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
| -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 c71a6e21e59..7daaf5f94b2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8056,7 +8056,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" |