summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-02-26 16:38:11 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 13:56:56 +0200
commit27266db06b90ac97f75a902a7255185838d2104d (patch)
tree56020922a2b3f2be109416f77fc526c2947d78ce /app
parent36753b78c065a54d7501f37f69fb49506f26688c (diff)
downloadgitlab-ce-27266db06b90ac97f75a902a7255185838d2104d.tar.gz
Remove information about maximum_job_timeout from runners lists
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/runners/_runner.html.haml5
-rw-r--r--app/views/admin/runners/index.html.haml1
-rw-r--r--app/views/projects/runners/_runner.html.haml2
3 files changed, 0 insertions, 8 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index fc6ad6dfe95..e1cee584929 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -19,11 +19,6 @@
%td
= runner.ip_address
%td
- - if runner.defines_maximum_job_timeout?
- = runner.maximum_job_timeout_human_readable
- - else
- n/a
- %td
- if runner.shared?
n/a
- else
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index a0c7d8f5fa9..9f13dbbbd82 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -61,7 +61,6 @@
%th Description
%th Version
%th IP Address
- %th Maximum timeout
%th Projects
%th Jobs
%th Tags
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml
index 91d6b172566..6376496ee1a 100644
--- a/app/views/projects/runners/_runner.html.haml
+++ b/app/views/projects/runners/_runner.html.haml
@@ -36,8 +36,6 @@
- if runner.description.present?
%p.runner-description
= runner.description
- - if runner.defines_maximum_job_timeout?
- %p Maximum job timeout: #{runner.maximum_job_timeout_human_readable}
- if runner.tag_list.present?
%p
- runner.tag_list.sort.each do |tag|