Commit 934f1f69 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-fix-admin-jobs-controller-timing-out' into 'master'

Fix /admin/jobs failing to load due to statement timeout

Closes #49767

See merge request gitlab-org/gitlab-ce!20909
parents 016dadc8 00709a13
...@@ -2,7 +2,7 @@ class Admin::JobsController < Admin::ApplicationController ...@@ -2,7 +2,7 @@ class Admin::JobsController < Admin::ApplicationController
def index def index
@scope = params[:scope] @scope = params[:scope]
@all_builds = Ci::Build @all_builds = Ci::Build
@builds = @all_builds.order('created_at DESC') @builds = @all_builds.order('id DESC')
@builds = @builds =
case @scope case @scope
when 'pending' when 'pending'
......
---
title: Fix /admin/jobs failing to load due to statement timeout
merge_request: 20909
author:
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment