diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-09-07 14:46:23 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-09-07 14:46:23 -0400 |
| commit | 3d9b6bc2b98583a5220870025e942077c9303eaf (patch) | |
| tree | c938afc9a0e169ab8ff0b6b55b96c2a5b365efee /app/controllers/admin | |
| parent | e4348ae8c221a63d0e2c4e428fcae8c3bca0eb2f (diff) | |
| parent | bc955cfc8e75e17897ab25717176209fefbba915 (diff) | |
| download | gitlab-ce-backport-issues-controller-changes.tar.gz | |
Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changes
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 | 3 |
3 files changed, 6 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..cbcef70e957 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 @@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController :provider, :remember_me, :skype, + :theme_id, :twitter, :username, :website_url |