diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-15 11:27:37 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-07 13:01:59 +0100 |
| commit | cfd475a45ee2655fa0148b0b561f95b44fe8641b (patch) | |
| tree | 84bc8f20239d58ed19e35cb515c50d3b36735c4f /app/controllers/admin | |
| parent | d1b60cbc67dc14b21820ef3f823a8e1ea851697d (diff) | |
| download | gitlab-ce-cfd475a45ee2655fa0148b0b561f95b44fe8641b.tar.gz | |
Removes default scope from sortable23079-remove-default-scope-in-sortable
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/broadcast_messages_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index 762e36ee2e9..c49b6459452 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -2,7 +2,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController before_action :finder, only: [:edit, :update, :destroy] def index - @broadcast_messages = BroadcastMessage.reorder("ends_at DESC").page(params[:page]) + @broadcast_messages = BroadcastMessage.order(ends_at: :desc).page(params[:page]) @broadcast_message = BroadcastMessage.new end diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 05e749c00c0..e85cdcb8db7 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -1,7 +1,7 @@ class Admin::DashboardController < Admin::ApplicationController def index - @projects = Project.without_deleted.with_route.limit(10) - @users = User.limit(10) - @groups = Group.with_route.limit(10) + @projects = Project.order_id_desc.without_deleted.with_route.limit(10) + @users = User.order_id_desc.limit(10) + @groups = Group.order_id_desc.with_route.limit(10) end end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index a99563b7100..9ec7719fabb 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -17,7 +17,7 @@ class Admin::UsersController < Admin::ApplicationController end def keys - @keys = user.keys + @keys = user.keys.order_id_desc end def new |