diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-12-02 08:24:11 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-12-02 08:24:11 +0000 |
| commit | ae737d94ac10284738928109c11f43aeecca8a0b (patch) | |
| tree | ebe739f663d259e0f2aaf2e2f2984a8d0bc9cf1e /app/controllers/api/v1/lists | |
| parent | 384a602fd4117a73338542c59985f54acf5fb3f8 (diff) | |
| parent | 4b85bf12ab7005a5a6b4472b8aeaf022ce042ad7 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/api/v1/lists')
| -rw-r--r-- | app/controllers/api/v1/lists/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb index ec4477034..23078263e 100644 --- a/app/controllers/api/v1/lists/accounts_controller.rb +++ b/app/controllers/api/v1/lists/accounts_controller.rb @@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController def load_accounts if unlimited? - @list.accounts.all + @list.accounts.includes(:account_stat).all else - @list.accounts.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) + @list.accounts.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) end end |