Commit 5fcaac92 authored by Mike Greiling's avatar Mike Greiling

Merge branch '49905-fix-checkboxes-runners' into 'master'

Resolve "Clicking on the text of checkboxes of runner's settings should toggle the checkbox"

Closes #49905

See merge request gitlab-org/gitlab-ce!21165
parents 89e53e4a 8a660c79
= form_for runner, url: runner_form_url do |f| = form_for runner, url: runner_form_url do |f|
= form_errors(runner) = form_errors(runner)
.form-group.row .form-group.row
= label :active, "Active", class: 'col-form-label col-sm-2' = label :active, _("Active"), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :active, { class: 'form-check-input' } = f.check_box :active, { class: 'form-check-input' }
%span.light Paused Runners don't accept new jobs %label.light{ for: :runner_active }= _("Paused Runners don't accept new jobs")
.form-group.row .form-group.row
= label :protected, "Protected", class: 'col-form-label col-sm-2' = label :protected, _("Protected"), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :access_level, { class: 'form-check-input' }, 'ref_protected', 'not_protected' = f.check_box :access_level, { class: 'form-check-input' }, 'ref_protected', 'not_protected'
%span.light This runner will only run on pipelines triggered on protected branches %label.light{ for: :runner_access_level }= _('This runner will only run on pipelines triggered on protected branches')
.form-group.row .form-group.row
= label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2' = label :run_untagged, _('Run untagged jobs'), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :run_untagged, { class: 'form-check-input' } = f.check_box :run_untagged, { class: 'form-check-input' }
%span.light Indicates whether this runner can pick jobs without tags %label.light{ for: :runner_run_untagged }= _('Indicates whether this runner can pick jobs without tags')
- unless runner.group_type? - unless runner.group_type?
.form-group.row .form-group.row
= label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2' = label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
.form-check .form-check
= f.check_box :locked, { class: 'form-check-input' } = f.check_box :locked, { class: 'form-check-input' }
%span.light= _('When a runner is locked, it cannot be assigned to other projects') %label.light{ for: :runner_locked }= _('When a runner is locked, it cannot be assigned to other projects')
.form-group.row .form-group.row
= label_tag :token, class: 'col-form-label col-sm-2' do = label_tag :token, class: 'col-form-label col-sm-2' do
Token = _('Token')
.col-sm-10 .col-sm-10
= f.text_field :token, class: 'form-control', readonly: true = f.text_field :token, class: 'form-control', readonly: true
.form-group.row .form-group.row
= label_tag :ip_address, class: 'col-form-label col-sm-2' do = label_tag :ip_address, class: 'col-form-label col-sm-2' do
IP Address = _('IP Address')
.col-sm-10 .col-sm-10
= f.text_field :ip_address, class: 'form-control', readonly: true = f.text_field :ip_address, class: 'form-control', readonly: true
.form-group.row .form-group.row
= label_tag :description, class: 'col-form-label col-sm-2' do = label_tag :description, class: 'col-form-label col-sm-2' do
Description = _('Description')
.col-sm-10 .col-sm-10
= f.text_field :description, class: 'form-control' = f.text_field :description, class: 'form-control'
.form-group.row .form-group.row
= label_tag :maximum_timeout_human_readable, class: 'col-form-label col-sm-2' do = label_tag :maximum_timeout_human_readable, class: 'col-form-label col-sm-2' do
Maximum job timeout = _('Maximum job timeout')
.col-sm-10 .col-sm-10
= f.text_field :maximum_timeout_human_readable, class: 'form-control' = f.text_field :maximum_timeout_human_readable, class: 'form-control'
.form-text.text-muted This timeout will take precedence when lower than Project-defined timeout .form-text.text-muted= _('This timeout will take precedence when lower than Project-defined timeout')
.form-group.row .form-group.row
= label_tag :tag_list, class: 'col-form-label col-sm-2' do = label_tag :tag_list, class: 'col-form-label col-sm-2' do
Tags = _('Tags')
.col-sm-10 .col-sm-10
= f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control' = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
.form-text.text-muted You can setup jobs to only use Runners with specific tags. Separate tags with commas. .form-text.text-muted= _('You can setup jobs to only use Runners with specific tags. Separate tags with commas.')
.form-actions .form-actions
= f.submit 'Save changes', class: 'btn btn-save' = f.submit _('Save changes'), class: 'btn btn-success'
---
title: Fix checkboxes on runner admin settings - The labels are now clickable
merge_request:
author:
type: fixed
...@@ -2971,6 +2971,9 @@ msgstr "" ...@@ -2971,6 +2971,9 @@ msgstr ""
msgid "IDE|Review" msgid "IDE|Review"
msgstr "" msgstr ""
msgid "IP Address"
msgstr ""
msgid "Identifier" msgid "Identifier"
msgstr "" msgstr ""
...@@ -3061,6 +3064,9 @@ msgstr "" ...@@ -3061,6 +3064,9 @@ msgstr ""
msgid "Incompatible Project" msgid "Incompatible Project"
msgstr "" msgstr ""
msgid "Indicates whether this runner can pick jobs without tags"
msgstr ""
msgid "Inline" msgid "Inline"
msgstr "" msgstr ""
...@@ -3390,6 +3396,9 @@ msgstr "" ...@@ -3390,6 +3396,9 @@ msgstr ""
msgid "Maximum git storage failures" msgid "Maximum git storage failures"
msgstr "" msgstr ""
msgid "Maximum job timeout"
msgstr ""
msgid "May" msgid "May"
msgstr "" msgstr ""
...@@ -3932,6 +3941,9 @@ msgstr "" ...@@ -3932,6 +3941,9 @@ msgstr ""
msgid "Pause" msgid "Pause"
msgstr "" msgstr ""
msgid "Paused Runners don't accept new jobs"
msgstr ""
msgid "Pending" msgid "Pending"
msgstr "" msgstr ""
...@@ -4424,6 +4436,9 @@ msgstr "" ...@@ -4424,6 +4436,9 @@ msgstr ""
msgid "Promote to group label" msgid "Promote to group label"
msgstr "" msgstr ""
msgid "Protected"
msgstr ""
msgid "Protip:" msgid "Protip:"
msgstr "" msgstr ""
...@@ -4639,6 +4654,9 @@ msgstr "" ...@@ -4639,6 +4654,9 @@ msgstr ""
msgid "Revoke" msgid "Revoke"
msgstr "" msgstr ""
msgid "Run untagged jobs"
msgstr ""
msgid "Runner token" msgid "Runner token"
msgstr "" msgstr ""
...@@ -5480,9 +5498,15 @@ msgstr "" ...@@ -5480,9 +5498,15 @@ msgstr ""
msgid "This repository" msgid "This repository"
msgstr "" msgstr ""
msgid "This runner will only run on pipelines triggered on protected branches"
msgstr ""
msgid "This source diff could not be displayed because it is too large." msgid "This source diff could not be displayed because it is too large."
msgstr "" msgstr ""
msgid "This timeout will take precedence when lower than Project-defined timeout"
msgstr ""
msgid "This user has no identities" msgid "This user has no identities"
msgstr "" msgstr ""
...@@ -5724,6 +5748,9 @@ msgstr "" ...@@ -5724,6 +5748,9 @@ msgstr ""
msgid "ToggleButton|Toggle Status: ON" msgid "ToggleButton|Toggle Status: ON"
msgstr "" msgstr ""
msgid "Token"
msgstr ""
msgid "Too many changes to show." msgid "Too many changes to show."
msgstr "" msgstr ""
...@@ -6150,6 +6177,9 @@ msgstr "" ...@@ -6150,6 +6177,9 @@ msgstr ""
msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}" msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
msgstr "" msgstr ""
msgid "You can setup jobs to only use Runners with specific tags. Separate tags with commas."
msgstr ""
msgid "You cannot write to this read-only GitLab instance." msgid "You cannot write to this read-only GitLab instance."
msgstr "" msgstr ""
......
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