From 8b7e8dcba16c27660233ace6318b70a28ca85e93 Mon Sep 17 00:00:00 2001 From: aschmitz Date: Tue, 19 Sep 2017 21:29:43 -0500 Subject: [PATCH] Back out RelationshipsController Change This was made to make a test a bit less flakey, but has nothing to do with this branch. --- app/controllers/api/v1/accounts/relationships_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb index 91a942d7530fb..a88cf2021acf9 100644 --- a/app/controllers/api/v1/accounts/relationships_controller.rb +++ b/app/controllers/api/v1/accounts/relationships_controller.rb @@ -7,10 +7,7 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController respond_to :json def index - accounts = Account.where(id: account_ids).select('id') - # .where doesn't guarantee that our results are in the same order - # we requested them, so return the "right" order to the requestor. - @accounts = accounts.index_by(&:id).values_at(*account_ids) + @accounts = Account.where(id: account_ids).select('id') render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships end