From 7d36a76180ce6bb207c6755bdffeba0b4edb6824 Mon Sep 17 00:00:00 2001
From: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Sat, 29 Apr 2017 17:50:10 +0900
Subject: [PATCH] Remove uneeded `ORDER BY` query (#2615)
---
app/controllers/follower_accounts_controller.rb | 8 +-------
app/controllers/following_accounts_controller.rb | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 165cbf1b56..25c7a893a0 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 faeea144ac..0a80626809 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
--
GitLab