Skip to content

G
gitlab-ce
Commit 0a877848 authored by Kerri Miller's avatar Kerri Miller
Browse files
Options

Merge branch 'eread/add-URL-help-text' into 'master' 

Add URL help text and edit other UI text

See merge request gitlab-org/gitlab!53578
parents 30abd67d 7c198de6
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 66 deletions
app/views/admin/hooks/_form.html.haml
View file @ 0a877848
......@@ -3,29 +3,30 @@
.form-group
= form.label :url, _('URL'), class: 'label-bold'
= form.text_field :url, class: 'form-control gl-form-input'
%p.form-text.text-muted= _('URL must be percent-encoded if neccessary.')
.form-group
= form.label :token, _('Secret Token'), class: 'label-bold'
= form.label :token, _('Secret token'), class: 'label-bold'
= form.text_field :token, class: 'form-control gl-form-input'
%p.form-text.text-muted= _('Use this token to validate received payloads')
%p.form-text.text-muted= _('Use this token to validate received payloads.')
.form-group
= form.label :url, _('Trigger'), class: 'label-bold'
.form-text.text-secondary.gl-mb-5= _('System hook will be triggered on set of events like creating project or adding ssh key. But you can also enable extra triggers like Push events.')
.form-text.text-secondary.gl-mb-5= _('System hooks are triggered on sets of events like creating a project or adding an SSH key. You can also enable extra triggers, such as push events.')
%fieldset.form-group.form-check
= form.check_box :repository_update_events, class: 'form-check-input'
= form.label :repository_update_events, _('Repository update events'), class: 'label-bold form-check-label'
.text-secondary= _('This URL will be triggered when repository is updated')
.text-secondary= _('URL is triggered when repository is updated')
%fieldset.form-group.form-check
= form.check_box :push_events, class: 'form-check-input'
= form.label :push_events, _('Push events'), class: 'label-bold form-check-label'
.text-secondary= _('This URL will be triggered for each branch updated to the repository')
.text-secondary= _('URL is triggered for each branch updated to the repository')
%fieldset.form-group.form-check
= form.check_box :tag_push_events, class: 'form-check-input'
= form.label :tag_push_events, _('Tag push events'), class: 'label-bold form-check-label'
.text-secondary= _('This URL will be triggered when a new tag is pushed to the repository')
.text-secondary= _('URL is triggered when a new tag is pushed to the repository')
%fieldset.form-group.form-check
= form.check_box :merge_requests_events, class: 'form-check-input'
= form.label :merge_requests_events, _('Merge request events'), class: 'label-bold form-check-label'
.text-secondary= _('This URL will be triggered when a merge request is created/updated/merged')
.text-secondary= _('URL is triggered when a merge request is created, updated, or merged')
.form-group
= form.label :enable_ssl_verification, _('SSL verification'), class: 'label-bold checkbox'
.form-check
......
app/views/shared/web_hooks/_form.html.haml
View file @ 0a877848
......@@ -3,11 +3,13 @@
.form-group
= form.label :url, s_('Webhooks|URL'), class: 'label-bold'
= form.text_field :url, class: 'form-control gl-form-input', placeholder: 'http://example.com/trigger-ci.json'
%p.form-text.text-muted
= s_('Webhooks|URL must be percent-encoded if neccessary.')
.form-group
= form.label :token, s_('Webhooks|Secret Token'), class: 'label-bold'
= form.label :token, s_('Webhooks|Secret token'), class: 'label-bold'
= form.text_field :token, class: 'form-control gl-form-input', placeholder: ''
%p.form-text.text-muted
= s_('Webhooks|Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header.')
= s_('Webhooks|Use this token to validate received payloads. It is sent with the request in the X-Gitlab-Token HTTP header.')
.form-group
= form.label :url, s_('Webhooks|Trigger'), class: 'label-bold'
%ul.list-unstyled.gl-ml-6
......@@ -17,37 +19,37 @@
%strong= s_('Webhooks|Push events')
= form.text_field :push_events_branch_filter, class: 'form-control gl-form-input', placeholder: 'Branch name or wildcard pattern to trigger on (leave blank for all)'
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered by a push to the repository')
= s_('Webhooks|URL is triggered by a push to the repository')
%li
= form.check_box :tag_push_events, class: 'form-check-input'
= form.label :tag_push_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Tag push events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a new tag is pushed to the repository')
= s_('Webhooks|URL is triggered when a new tag is pushed to the repository')
%li
= form.check_box :note_events, class: 'form-check-input'
= form.label :note_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Comments')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when someone adds a comment')
= s_('Webhooks|URL is triggered when someone adds a comment')
%li
= form.check_box :confidential_note_events, class: 'form-check-input'
= form.label :confidential_note_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Confidential Comments')
%strong= s_('Webhooks|Confidential comments')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when someone adds a comment on a confidential issue')
= s_('Webhooks|URL is triggered when someone adds a comment on a confidential issue')
%li
= form.check_box :issues_events, class: 'form-check-input'
= form.label :issues_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Issues events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when an issue is created/updated/merged')
= s_('Webhooks|URL is triggered when an issue is created, updated, or merged')
%li
= 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
%strong= s_('Webhooks|Confidential Issues events')
%strong= s_('Webhooks|Confidential issues events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a confidential issue is created/updated/merged')
= s_('Webhooks|URL is triggered when a confidential issue is created, updated, or merged')
- if @group
= render_if_exists 'groups/hooks/member_events', form: form
= render_if_exists 'groups/hooks/subgroup_events', form: form
......@@ -56,43 +58,43 @@
= form.label :merge_requests_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Merge request events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a merge request is created/updated/merged')
= s_('Webhooks|URL is triggered when a merge request is created, updated, or merged')
%li
= form.check_box :job_events, class: 'form-check-input'
= form.label :job_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Job events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when the job status changes')
= s_('Webhooks|URL is triggered when the job status changes')
%li
= form.check_box :pipeline_events, class: 'form-check-input'
= form.label :pipeline_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Pipeline events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when the pipeline status changes')
= s_('Webhooks|URL is triggered when the pipeline status changes')
%li
= form.check_box :wiki_page_events, class: 'form-check-input'
= form.label :wiki_page_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Wiki Page events')
%strong= s_('Webhooks|Wiki page events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a wiki page is created/updated')
= s_('Webhooks|URL is triggered when a wiki page is created or updated')
%li
= form.check_box :deployment_events, class: 'form-check-input'
= form.label :deployment_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Deployment events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL is triggered when a deployment starts, finishes, fails, or is canceled')
= s_('Webhooks|URL is triggered when a deployment starts, finishes, fails, or is canceled')
%li
= form.check_box :feature_flag_events, class: 'form-check-input'
= form.label :feature_flag_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Feature Flag events')
%strong= s_('Webhooks|Feature flag events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL is triggered when a feature flag is turned on or off')
= s_('Webhooks|URL is triggered when a feature flag is turned on or off')
%li
= form.check_box :releases_events, class: 'form-check-input'
= form.label :releases_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Releases events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL is triggered when a release is created/updated')
= s_('Webhooks|URL is triggered when a release is created or updated')
.form-group
= form.label :enable_ssl_verification, s_('Webhooks|SSL verification'), class: 'label-bold checkbox'
.form-check
......
changelogs/unreleased/eread-add-URL-help-text.yml 0 → 100644
View file @ 0a877848
---
title: Add URL help text and edit other UI text
merge_request: 53578
author:
type: other
ee/app/views/groups/hooks/_member_events.html.haml
View file @ 0a877848
......@@ -3,4 +3,4 @@
= form.label :member_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Member events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a group member is created/updated/removed')
= s_('Webhooks|URL is triggered when a group member is created, updated, or removed')
ee/app/views/groups/hooks/_subgroup_events.html.haml
View file @ 0a877848
......@@ -3,4 +3,4 @@
= form.label :subgroup_events, class: 'list-label form-check-label gl-ml-1' do
%strong= s_('Webhooks|Subgroup events')
%p.text-muted.gl-ml-1
= s_('Webhooks|This URL will be triggered when a subgroup is created/removed')
= s_('Webhooks|URL is triggered when a subgroup is created or removed')
locale/gitlab.pot
View file @ 0a877848
......@@ -26030,7 +26030,7 @@ msgstr ""
msgid "Secret Detection"
msgstr ""
msgid "Secret Token"
msgid "Secret token"
msgstr ""
msgid "Security"
......@@ -28607,7 +28607,7 @@ msgstr ""
msgid "System hook was successfully updated."
msgstr ""
msgid "System hook will be triggered on set of events like creating project or adding ssh key. But you can also enable extra triggers like Push events."
msgid "System hooks are triggered on sets of events like creating a project or adding an SSH key. You can also enable extra triggers, such as push events."
msgstr ""
msgid "System metrics (Custom)"
......@@ -29880,18 +29880,6 @@ msgstr ""
msgid "This URL is already used for another link; duplicate URLs are not allowed"
msgstr ""
msgid "This URL will be triggered for each branch updated to the repository"
msgstr ""
msgid "This URL will be triggered when a merge request is created/updated/merged"
msgstr ""
msgid "This URL will be triggered when a new tag is pushed to the repository"
msgstr ""
msgid "This URL will be triggered when repository is updated"
msgstr ""
msgid "This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention."
msgstr ""
......@@ -31317,6 +31305,21 @@ msgstr ""
msgid "URL is required"
msgstr ""
msgid "URL is triggered for each branch updated to the repository"
msgstr ""
msgid "URL is triggered when a merge request is created, updated, or merged"
msgstr ""
msgid "URL is triggered when a new tag is pushed to the repository"
msgstr ""
msgid "URL is triggered when repository is updated"
msgstr ""
msgid "URL must be percent-encoded if neccessary."
msgstr ""
msgid "URL must start with %{codeStart}http://%{codeEnd}, %{codeStart}https://%{codeEnd}, or %{codeStart}ftp://%{codeEnd}"
msgstr ""
......@@ -31938,7 +31941,7 @@ msgstr ""
msgid "Use template"
msgstr ""
msgid "Use this token to validate received payloads"
msgid "Use this token to validate received payloads."
msgstr ""
msgid "Use webhook"
......@@ -32941,10 +32944,10 @@ msgstr ""
msgid "Webhooks|Comments"
msgstr ""
msgid "Webhooks|Confidential Comments"
msgid "Webhooks|Confidential comments"
msgstr ""
msgid "Webhooks|Confidential Issues events"
msgid "Webhooks|Confidential issues events"
msgstr ""
msgid "Webhooks|Deployment events"
......@@ -32953,7 +32956,7 @@ msgstr ""
msgid "Webhooks|Enable SSL verification"
msgstr ""
msgid "Webhooks|Feature Flag events"
msgid "Webhooks|Feature flag events"
msgstr ""
msgid "Webhooks|Issues events"
......@@ -32980,7 +32983,7 @@ msgstr ""
msgid "Webhooks|SSL verification"
msgstr ""
msgid "Webhooks|Secret Token"
msgid "Webhooks|Secret token"
msgstr ""
msgid "Webhooks|Subgroup events"
......@@ -32989,61 +32992,64 @@ msgstr ""
msgid "Webhooks|Tag push events"
msgstr ""
msgid "Webhooks|This URL is triggered when a deployment starts, finishes, fails, or is canceled"
msgid "Webhooks|Trigger"
msgstr ""
msgid "Webhooks|This URL is triggered when a feature flag is turned on or off"
msgid "Webhooks|URL"
msgstr ""
msgid "Webhooks|This URL is triggered when a release is created/updated"
msgid "Webhooks|URL is triggered by a push to the repository"
msgstr ""
msgid "Webhooks|This URL will be triggered by a push to the repository"
msgid "Webhooks|URL is triggered when a confidential issue is created, updated, or merged"
msgstr ""
msgid "Webhooks|This URL will be triggered when a confidential issue is created/updated/merged"
msgid "Webhooks|URL is triggered when a deployment starts, finishes, fails, or is canceled"
msgstr ""
msgid "Webhooks|This URL will be triggered when a group member is created/updated/removed"
msgid "Webhooks|URL is triggered when a feature flag is turned on or off"
msgstr ""
msgid "Webhooks|This URL will be triggered when a merge request is created/updated/merged"
msgid "Webhooks|URL is triggered when a group member is created, updated, or removed"
msgstr ""
msgid "Webhooks|This URL will be triggered when a new tag is pushed to the repository"
msgid "Webhooks|URL is triggered when a merge request is created, updated, or merged"
msgstr ""
msgid "Webhooks|This URL will be triggered when a subgroup is created/removed"
msgid "Webhooks|URL is triggered when a new tag is pushed to the repository"
msgstr ""
msgid "Webhooks|This URL will be triggered when a wiki page is created/updated"
msgid "Webhooks|URL is triggered when a release is created or updated"
msgstr ""
msgid "Webhooks|This URL will be triggered when an issue is created/updated/merged"
msgid "Webhooks|URL is triggered when a subgroup is created or removed"
msgstr ""
msgid "Webhooks|This URL will be triggered when someone adds a comment"
msgid "Webhooks|URL is triggered when a wiki page is created or updated"
msgstr ""
msgid "Webhooks|This URL will be triggered when someone adds a comment on a confidential issue"
msgid "Webhooks|URL is triggered when an issue is created, updated, or merged"
msgstr ""
msgid "Webhooks|This URL will be triggered when the job status changes"
msgid "Webhooks|URL is triggered when someone adds a comment"
msgstr ""
msgid "Webhooks|This URL will be triggered when the pipeline status changes"
msgid "Webhooks|URL is triggered when someone adds a comment on a confidential issue"
msgstr ""
msgid "Webhooks|Trigger"
msgid "Webhooks|URL is triggered when the job status changes"
msgstr ""
msgid "Webhooks|URL"
msgid "Webhooks|URL is triggered when the pipeline status changes"
msgstr ""
msgid "Webhooks|URL must be percent-encoded if neccessary."
msgstr ""
msgid "Webhooks|Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header."
msgid "Webhooks|Use this token to validate received payloads. It is sent with the request in the X-Gitlab-Token HTTP header."
msgstr ""
msgid "Webhooks|Wiki Page events"
msgid "Webhooks|Wiki page events"
msgstr ""
msgid "Wednesday"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7