diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-09 11:39:30 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-09 11:39:30 +0000 |
commit | c078bd2609771332b97828386ed2662ccd024c53 (patch) | |
tree | ed01ce181eb0744e33696da2450281612cd78fc2 | |
parent | 569fa3f6efe3f9a034fb5235c71f1827d9968ae6 (diff) | |
parent | 07d0e2bbf05437d7dfc21aa95338163930ff827d (diff) | |
download | gitlab-ci-c078bd2609771332b97828386ed2662ccd024c53.tar.gz |
Merge branch 'runners_sorting' into 'master'
Runners sorting in admin area
See merge request !59
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/controllers/admin/runners_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -6,6 +6,7 @@ v7.10.0 - Events per projects - Search for runners in admin area - UI improvements: created separated admin section, removed useless project show page + - Runners sorting in admin area (by id) v7.9.3 - Contains no changes diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb index fd1b6b2..2d530c1 100644 --- a/app/controllers/admin/runners_controller.rb +++ b/app/controllers/admin/runners_controller.rb @@ -2,7 +2,7 @@ class Admin::RunnersController < Admin::ApplicationController before_filter :runner, except: :index def index - @runners = Runner.all + @runners = Runner.order('id DESC') @runners = @runners.search(params[:search]) if params[:search].present? @runners = @runners.page(params[:page]).per(30) end |