diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-04 13:20:29 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-07 08:54:08 +0200 |
| commit | bb7597ef7dd7885814e5589992a32876a60c5e80 (patch) | |
| tree | 4c8cb6262165248c6e3836c026a23ebe28a4baef | |
| parent | 18500fdfa837e377109e43a2d2ec04df109cfc36 (diff) | |
| download | gitlab-ce-bb7597ef7dd7885814e5589992a32876a60c5e80.tar.gz | |
Add ip address and timeout to group runner views
| -rw-r--r-- | app/views/groups/runners/_form.html.haml | 11 | ||||
| -rw-r--r-- | app/views/groups/runners/show.html.haml | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/app/views/groups/runners/_form.html.haml b/app/views/groups/runners/_form.html.haml index 18bcc56688f..3efa145f86a 100644 --- a/app/views/groups/runners/_form.html.haml +++ b/app/views/groups/runners/_form.html.haml @@ -24,11 +24,22 @@ .col-sm-10 = f.text_field :token, class: 'form-control', readonly: true .form-group + = label_tag :ip_address, class: 'control-label' do + IP Address + .col-sm-10 + = f.text_field :ip_address, class: 'form-control', readonly: true + .form-group = label_tag :description, class: 'control-label' do Description .col-sm-10 = f.text_field :description, class: 'form-control' .form-group + = label_tag :maximum_timeout_human_readable, class: 'control-label' do + Maximum job timeout + .col-sm-10 + = f.text_field :maximum_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 Tags .col-sm-10 diff --git a/app/views/groups/runners/show.html.haml b/app/views/groups/runners/show.html.haml index 7836b02248e..0390607543d 100644 --- a/app/views/groups/runners/show.html.haml +++ b/app/views/groups/runners/show.html.haml @@ -31,6 +31,9 @@ %td Version %td= @runner.version %tr + %td IP Address + %td= @runner.ip_address + %tr %td Revision %td= @runner.revision %tr @@ -43,9 +46,12 @@ %td Description %td= @runner.description %tr + %td Maximum job timeout + %td= @runner.maximum_timeout_human_readable + %tr %td Last contact %td - if @runner.contacted_at - #{time_ago_in_words(@runner.contacted_at)} ago + = time_ago_with_tooltip @runner.contacted_at - else Never |