kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-01-16 18:10:52 +00:00
parent 45e0a3af4d
commit 040a67a25a
3 changed files with 64 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/views/admin/hooks/_form.html.haml
View File

@ -1,52 +1,33 @@
= form_errors(hook)
.form-group
= form.label :url, 'URL', class: 'label-bold'
= form.label :url, _('URL'), class: 'label-bold'
= form.text_field :url, class: 'form-control'
.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'
%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'
%ul.list-unstyled
%li
.form-text.text-muted
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.
.gl-mt-3
= form.check_box :repository_update_events, class: 'float-left'
.gl-ml-6
= form.label :repository_update_events, class: 'list-label' do
%strong Repository update events
%p.light
This URL will be triggered when repository is updated
%li
= form.check_box :push_events, class: 'float-left'
.gl-ml-6
= form.label :push_events, class: 'list-label' do
%strong Push events
%p.light
This URL will be triggered for each branch updated to the repository
%li
= form.check_box :tag_push_events, class: 'float-left'
.gl-ml-6
= form.label :tag_push_events, class: 'list-label' do
%strong Tag push events
%p.light
This URL will be triggered when a new tag is pushed to the repository
%li
= form.check_box :merge_requests_events, class: 'float-left'
.gl-ml-6
= form.label :merge_requests_events, class: 'list-label' do
%strong Merge request events
%p.light
This URL will be triggered when a merge request is created/updated/merged
= 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.')
%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')
%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')
%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')
%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')
.form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox'
= form.label :enable_ssl_verification, _('SSL verification'), class: 'label-bold checkbox'
.form-check
= form.check_box :enable_ssl_verification, class: 'form-check-input'
= form.label :enable_ssl_verification, class: 'form-check-label' do
%strong Enable SSL verification
= form.label :enable_ssl_verification, _('Enable SSL verification'), class: 'label-bold form-check-label'

5
changelogs/unreleased/yo-master-patch-67232.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Align checkbox in system hooks page in admin
merge_request: 50958
author: Yogi (@yo)
type: fixed

36
locale/gitlab.pot
View File

@ -10710,6 +10710,9 @@ msgstr ""
msgid "Enable Pseudonymizer data collection"
msgstr ""
msgid "Enable SSL verification"
msgstr ""
msgid "Enable Seat Link"
msgstr ""
@ -17661,6 +17664,9 @@ msgstr ""
msgid "Merge request dependencies"
msgstr ""
msgid "Merge request events"
msgstr ""
msgid "Merge request was scheduled to merge after pipeline succeeds"
msgstr ""
@ -24040,6 +24046,9 @@ msgstr ""
msgid "Repository synchronization concurrency limit"
msgstr ""
msgid "Repository update events"
msgstr ""
msgid "Repository: %{counter_repositories} / Wikis: %{counter_wikis} / Build Artifacts: %{counter_build_artifacts} / LFS: %{counter_lfs_objects} / Snippets: %{counter_snippets} / Packages: %{counter_packages} / Uploads: %{counter_uploads}"
msgstr ""
@ -24600,6 +24609,9 @@ msgstr ""
msgid "SSL Verification:"
msgstr ""
msgid "SSL verification"
msgstr ""
msgid "Satisfied"
msgstr ""
@ -24946,6 +24958,9 @@ msgstr ""
msgid "Secret Detection"
msgstr ""
msgid "Secret Token"
msgstr ""
msgid "Security"
msgstr ""
@ -27496,6 +27511,9 @@ 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."
msgstr ""
msgid "System metrics (Custom)"
msgstr ""
@ -27520,6 +27538,9 @@ msgstr ""
msgid "Tag name is required"
msgstr ""
msgid "Tag push events"
msgstr ""
msgid "Tag this commit."
msgstr ""
@ -28715,6 +28736,18 @@ 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 ""
@ -30731,6 +30764,9 @@ msgstr ""
msgid "Use template"
msgstr ""
msgid "Use this token to validate received payloads"
msgstr ""
msgid "Use your global notification setting"
msgstr ""