diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-07-30 22:09:46 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-07-30 22:09:46 +0300 |
| commit | 934f1f69022ab39b62161d26c4d1d485bd66b09f (patch) | |
| tree | 98f6c178507c2176f37e03f3e0d938b0190db5ce | |
| parent | 016dadc860251ade20860c2ca533a43dff789018 (diff) | |
| parent | 00709a13a4197a8edd4cf9e6529c5d94f01ba012 (diff) | |
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
| -rw-r--r-- | app/controllers/admin/jobs_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-admin-jobs-controller-timing-out.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/admin/jobs_controller.rb b/app/controllers/admin/jobs_controller.rb index ac1ae0f16b3..e355d5fdea7 100644 --- a/app/controllers/admin/jobs_controller.rb +++ b/app/controllers/admin/jobs_controller.rb @@ -2,7 +2,7 @@ class Admin::JobsController < Admin::ApplicationController def index @scope = params[:scope] @all_builds = Ci::Build - @builds = @all_builds.order('created_at DESC') + @builds = @all_builds.order('id DESC') @builds = case @scope when 'pending' diff --git a/changelogs/unreleased/sh-fix-admin-jobs-controller-timing-out.yml b/changelogs/unreleased/sh-fix-admin-jobs-controller-timing-out.yml new file mode 100644 index 00000000000..e1adebbf076 --- /dev/null +++ b/changelogs/unreleased/sh-fix-admin-jobs-controller-timing-out.yml @@ -0,0 +1,5 @@ +--- +title: Fix /admin/jobs failing to load due to statement timeout +merge_request: 20909 +author: +type: performance |