Merge branch 'master' into 1969-persistent-switch

[arvados.git] / services / api / app / controllers / application_controller.rb

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 6907faf1c2649a63f5e408837092628dbfb22807..e1b8fc914467b192b9b0b762d152b554185f50d1 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -103,7 +103,7 @@ class ApplicationController < ActionController::Base
                   "    AND mng_links.head_uuid=#{klass.table_name}.uuid")
           cond_sql += " OR mng_links.uuid IS NOT NULL"
         end
-        @objects = @objects.where(cond_sql, *cond_params)
+        @objects = @objects.where(cond_sql, *cond_params).order(:uuid)
         @limit = limit_all - all_objects.count
         apply_where_limit_order_params
         items_available = @objects.