diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-05-09 23:38:42 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-05-09 23:38:42 +0200 |
| commit | 9d7599d718f72cdaf204fccfa93ae61b7ebdacf5 (patch) | |
| tree | 0db57c7a35e26bd94ead90f827603ef4f06e8cd5 /app/views/shared/runners | |
| parent | 0f4aa6598add80cdd6ae2ec0aede110b89e1d325 (diff) | |
| parent | 1a9f90f8c132feb5760720931597e1bff28d386d (diff) | |
| download | gitlab-ce-9d7599d718f72cdaf204fccfa93ae61b7ebdacf5.tar.gz | |
Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-type
Diffstat (limited to 'app/views/shared/runners')
| -rw-r--r-- | app/views/shared/runners/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/runners/show.html.haml | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml index a995c355bd8..302a543cf12 100644 --- a/app/views/shared/runners/_form.html.haml +++ b/app/views/shared/runners/_form.html.haml @@ -20,11 +20,11 @@ %span.light Indicates whether this runner can pick jobs without tags - unless runner.group_type? .form-group - = label :locked, 'Lock to current projects', class: 'control-label' + = label :locked, _('Lock to current projects'), class: 'control-label' .col-sm-10 .checkbox = f.check_box :locked - %span.light When a runner is locked, it cannot be assigned to other projects + %span.light= _('When a runner is locked, it cannot be assigned to other projects') .form-group = label_tag :token, class: 'control-label' do Token diff --git a/app/views/shared/runners/show.html.haml b/app/views/shared/runners/show.html.haml index 1a386d96bcd..93c6ba86640 100644 --- a/app/views/shared/runners/show.html.haml +++ b/app/views/shared/runners/show.html.haml @@ -21,17 +21,17 @@ %th Value %tr %td Active - %td= @runner.active? ? 'Yes' : 'No' + %td= @runner.active? ? _('Yes') : _('No') %tr %td Protected - %td= @runner.ref_protected? ? 'Yes' : 'No' + %td= @runner.ref_protected? ? _('Yes') : _('No') %tr - %td Can run untagged jobs - %td= @runner.run_untagged? ? 'Yes' : 'No' + %td= _('Can run untagged jobs') + %td= @runner.run_untagged? ? _('Yes') : _('No') - unless @runner.group_type? %tr - %td Locked to this project - %td= @runner.locked? ? 'Yes' : 'No' + %td= _('Locked to this project') + %td= @runner.locked? ? _('Yes') : _('No') %tr %td Tags %td @@ -60,7 +60,7 @@ %td Description %td= @runner.description %tr - %td Maximum job timeout + %td= _('Maximum job timeout') %td= @runner.maximum_timeout_human_readable %tr %td Last contact |