Commit dee163de authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'ld-correct-copy-for-issue-hooks' into 'master'

Fix issue hook events text

See merge request gitlab-org/gitlab!60453
parents 7aa4b4a8 8edd1e57
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
= form.label :issues_events, class: 'list-label form-check-label gl-ml-1' do = form.label :issues_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Issues events') %strong= s_('Webhooks|Issues events')
%p.text-muted.gl-ml-1 %p.text-muted.gl-ml-1
= s_('Webhooks|URL is triggered when an issue is created, updated, or merged') = s_('Webhooks|URL is triggered when an issue is created, updated, closed, or reopened')
%li %li
= form.check_box :confidential_issues_events, class: 'form-check-input' = form.check_box :confidential_issues_events, class: 'form-check-input'
= form.label :confidential_issues_events, class: 'list-label form-check-label gl-ml-1' do = form.label :confidential_issues_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Confidential issues events') %strong= s_('Webhooks|Confidential issues events')
%p.text-muted.gl-ml-1 %p.text-muted.gl-ml-1
= s_('Webhooks|URL is triggered when a confidential issue is created, updated, or merged') = s_('Webhooks|URL is triggered when a confidential issue is created, updated, closed, or reopened')
- if @group - if @group
= render_if_exists 'groups/hooks/member_events', form: form = render_if_exists 'groups/hooks/member_events', form: form
= render_if_exists 'groups/hooks/subgroup_events', form: form = render_if_exists 'groups/hooks/subgroup_events', form: form
......
---
title: Fix copy on webhook admin pages for "Issues events" and "Confidential issues
events"
merge_request: 60453
author:
type: changed
...@@ -35853,7 +35853,7 @@ msgstr "" ...@@ -35853,7 +35853,7 @@ msgstr ""
msgid "Webhooks|URL is triggered by a push to the repository" msgid "Webhooks|URL is triggered by a push to the repository"
msgstr "" msgstr ""
msgid "Webhooks|URL is triggered when a confidential issue is created, updated, or merged" msgid "Webhooks|URL is triggered when a confidential issue is created, updated, closed, or reopened"
msgstr "" msgstr ""
msgid "Webhooks|URL is triggered when a deployment starts, finishes, fails, or is canceled" msgid "Webhooks|URL is triggered when a deployment starts, finishes, fails, or is canceled"
...@@ -35880,7 +35880,7 @@ msgstr "" ...@@ -35880,7 +35880,7 @@ msgstr ""
msgid "Webhooks|URL is triggered when a wiki page is created or updated" msgid "Webhooks|URL is triggered when a wiki page is created or updated"
msgstr "" msgstr ""
msgid "Webhooks|URL is triggered when an issue is created, updated, or merged" msgid "Webhooks|URL is triggered when an issue is created, updated, closed, or reopened"
msgstr "" msgstr ""
msgid "Webhooks|URL is triggered when someone adds a comment" msgid "Webhooks|URL is triggered when someone adds a comment"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment