From 024bf066dfe121b233848f7d0841207846caec5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 13 Feb 2019 22:09:59 +0100 Subject: [PATCH 1/2] Use limited counter for builds --- app/views/admin/runners/_runner.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index ec57eb1ed08..4641986cb56 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -44,7 +44,7 @@ .table-section.section-5 .table-mobile-header{ role: 'rowheader' }= _('Jobs') .table-mobile-content - = runner.builds.count(:all) + = limited_counter_with_delimiter(runner.builds) .table-section.section-10.section-wrap .table-mobile-header{ role: 'rowheader' }= _('Tags') From b170d12dabea31e0ecdba6765d1680021fefcc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 13 Feb 2019 22:28:19 +0100 Subject: [PATCH 2/2] Add CHANGELOG entry --- ...dmin-runners-page-fails-with-an-sql-statement-timeout.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml diff --git a/changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml b/changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml new file mode 100644 index 00000000000..e0ed38fc2fa --- /dev/null +++ b/changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Use limited counter for runner build count in admin page. +merge_request: 25220 +author: +type: fixed