diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-13 16:36:46 -0500 |
| commit | ed490b781f9347b77eb2305e33ba6dd83f3539b0 (patch) | |
| tree | 4f958ce8da072e35ef654cf5ae0a152f613f3ad8 /app/controllers/settings | |
| parent | a817f084eafaf5527445c29ab1d68f42b1a2872f (diff) | |
| parent | 50529cbceb84e611bca497624a7a4c38113e5135 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock config/application.rb
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/follower_domains_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/follower_domains_controller.rb b/app/controllers/settings/follower_domains_controller.rb index 141b2270d..02533b81a 100644 --- a/app/controllers/settings/follower_domains_controller.rb +++ b/app/controllers/settings/follower_domains_controller.rb @@ -5,7 +5,7 @@ require 'sidekiq-bulk' class Settings::FollowerDomainsController < Settings::BaseController def show @account = current_account - @domains = current_account.followers.reorder('MIN(follows.id) DESC').group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10) + @domains = current_account.followers.reorder(Arel.sql('MIN(follows.id) DESC')).group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10) end def update |