about summary refs log tree commit diff
diff options
context:
space:
mode:
authoralpaca-tc <alpaca-tc@alpaca.tc>2017-04-29 17:50:10 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-04-29 10:50:10 +0200
commit7d36a76180ce6bb207c6755bdffeba0b4edb6824 (patch)
treef9627de8e355dd6d6443d9a9b344bd6a028b903f
parent197af5de70221498f44c60ebfbffd4d4c803dead (diff)
Remove uneeded `ORDER BY` query (#2615)
-rw-r--r--app/controllers/follower_accounts_controller.rb8
-rw-r--r--app/controllers/following_accounts_controller.rb8
2 files changed, 2 insertions, 14 deletions
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 165cbf1b5..25c7a893a 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -4,12 +4,6 @@ class FollowerAccountsController < ApplicationController
   include AccountControllerConcern
 
   def index
-    @accounts = ordered_accounts.page(params[:page]).per(FOLLOW_PER_PAGE)
-  end
-
-  private
-
-  def ordered_accounts
-    @account.followers.order('follows.created_at desc')
+    @accounts = @account.followers.page(params[:page]).per(FOLLOW_PER_PAGE)
   end
 end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index faeea144a..0a8062680 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -4,12 +4,6 @@ class FollowingAccountsController < ApplicationController
   include AccountControllerConcern
 
   def index
-    @accounts = ordered_accounts.page(params[:page]).per(FOLLOW_PER_PAGE)
-  end
-
-  private
-
-  def ordered_accounts
-    @account.following.order('follows.created_at desc')
+    @accounts = @account.following.page(params[:page]).per(FOLLOW_PER_PAGE)
   end
 end