Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3d266ad0
Commit
3d266ad0
authored
Feb 22, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
ac7dfe9c
0270e068
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml
...dmin-runners-page-fails-with-an-sql-statement-timeout.yml
+5
-0
No files found.
app/views/admin/runners/_runner.html.haml
View file @
3d266ad0
...
...
@@ -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'
)
...
...
changelogs/unreleased/53325-admin-runners-page-fails-with-an-sql-statement-timeout.yml
0 → 100644
View file @
3d266ad0
---
title
:
Use limited counter for runner build count in admin page.
merge_request
:
25220
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment