diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-26 16:35:08 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:56:55 +0200 |
| commit | 36753b78c065a54d7501f37f69fb49506f26688c (patch) | |
| tree | 6d9b2e01e3ce4bb140ecb0d81ee690bd48cae036 /app/views | |
| parent | 4ce376c0649faf4dea01857c312379771bdf37b7 (diff) | |
| download | gitlab-ce-36753b78c065a54d7501f37f69fb49506f26688c.tar.gz | |
Replace user_readable with human_readable
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/show.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 5f0fb5079d9..fc6ad6dfe95 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -20,7 +20,7 @@ = runner.ip_address %td - if runner.defines_maximum_job_timeout? - = runner.maximum_job_timeout_user_readable + = runner.maximum_job_timeout_human_readable - else n/a %td diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml index 8fb8e6e0ebf..7e9435e0110 100644 --- a/app/views/projects/runners/_form.html.haml +++ b/app/views/projects/runners/_form.html.haml @@ -40,10 +40,10 @@ .col-sm-10 = f.text_field :description, class: 'form-control' .form-group - = label_tag :maximum_job_timeout_user_readable, class: 'control-label' do + = label_tag :maximum_job_timeout_human_readable, class: 'control-label' do Maximum job timeout .col-sm-10 - = f.text_field :maximum_job_timeout_user_readable, class: 'form-control' + = f.text_field :maximum_job_timeout_human_readable, class: 'form-control' .help-block This timeout will take precedence when lower than Project-defined timeout .form-group = label_tag :tag_list, class: 'control-label' do diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index f7c41fe44c0..91d6b172566 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -37,7 +37,7 @@ %p.runner-description = runner.description - if runner.defines_maximum_job_timeout? - %p Maximum job timeout: #{runner.maximum_job_timeout_user_readable} + %p Maximum job timeout: #{runner.maximum_job_timeout_human_readable} - if runner.tag_list.present? %p - runner.tag_list.sort.each do |tag| diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml index 0d39236680c..67084e3d66a 100644 --- a/app/views/projects/runners/show.html.haml +++ b/app/views/projects/runners/show.html.haml @@ -57,7 +57,7 @@ %td= @runner.description %tr %td Maximum job timeout - %td= @runner.maximum_job_timeout_user_readable + %td= @runner.maximum_job_timeout_human_readable %tr %td Last contact %td |