diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-16 21:10:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-16 21:10:52 +0300 |
commit | 040a67a25a4f7b06a64d4088c6e7505d27d4398a (patch) | |
tree | 5ba50f04aa96933d0ce8d32ed7697b64aaa57d24 | |
parent | 45e0a3af4d48c93ae297aa6f452955aa546e9eb7 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/views/admin/hooks/_form.html.haml | 65 | ||||
-rw-r--r-- | changelogs/unreleased/yo-master-patch-67232.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 36 |
3 files changed, 64 insertions, 42 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml index 5bc5404fada..e6abd8ff85a 100644 --- a/app/views/admin/hooks/_form.html.haml +++ b/app/views/admin/hooks/_form.html.haml @@ -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' diff --git a/changelogs/unreleased/yo-master-patch-67232.yml b/changelogs/unreleased/yo-master-patch-67232.yml new file mode 100644 index 00000000000..f21fb9bd136 --- /dev/null +++ b/changelogs/unreleased/yo-master-patch-67232.yml @@ -0,0 +1,5 @@ +--- +title: Align checkbox in system hooks page in admin +merge_request: 50958 +author: Yogi (@yo) +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c8b97a7ac56..f29e769c5d4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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 "" |