From d63678068a2e31dcd9930c0f96e07dc2dcb78b6b Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Fri, 29 Nov 2024 07:52:05 +0000 Subject: Fix random test failure by ensuring @WatchersController#find_objects_from_params@ returns results in consistent order (#41894). Patch by Go MAEDA (user:maeda). git-svn-id: https://svn.redmine.org/redmine/trunk@23325 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/watchers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 34f1ffebe..c957e7a64 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -217,7 +217,7 @@ class WatchersController < ApplicationController return unless klass < ApplicationRecord return unless klass < Redmine::Acts::Watchable::InstanceMethods - scope = klass.where(:id => Array.wrap(params[:object_id])) + scope = klass.where(:id => Array.wrap(params[:object_id])).order(:id) if klass.reflect_on_association(:project) scope = scope.preload(:project => :enabled_modules) end -- cgit v1.2.3