tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	Gemfile.lock
 	config/application.rb
This commit is contained in:
David Yip
2018-04-13 16:36:46 -05:00
parent a817f084ea 50529cbceb
commit ed490b781f
22 changed files with 334 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/follower_domains_controller.rb
View File

@@ -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