summaryrefslogtreecommitdiff
path: root/app/controllers/admin/users_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-07 16:15:32 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-07 16:15:32 +0000
commit523a1c69ab6c51969f2613c4042d91318f841081 (patch)
treea30cd8e62725a818a9d0e4bfa6405fe194fdc3d6 /app/controllers/admin/users_controller.rb
parentec304cb9297ae75a7f46d6945d537c5d1cbd2fdf (diff)
parentcfd475a45ee2655fa0148b0b561f95b44fe8641b (diff)
downloadgitlab-ce-523a1c69ab6c51969f2613c4042d91318f841081.tar.gz
Merge branch '23079-remove-default-scope-in-sortable' into 'master'
Removes default scope from sortable Closes #23079 See merge request !13558
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
-rw-r--r--app/controllers/admin/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 635298bc24a..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