diff options
| author | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
| commit | 4d77314005483e53e320a82c87805c6bcca1c463 (patch) | |
| tree | 99f5b05bcbb1e8278517bf9a8f9ab114ab2dec45 /app/controllers/directories_controller.rb | |
| parent | e356a902d23a0ed87c62717085a37d34550c8464 (diff) | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/directories_controller.rb')
| -rw-r--r-- | app/controllers/directories_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb index 70013d760..59247a21f 100644 --- a/app/controllers/directories_controller.rb +++ b/app/controllers/directories_controller.rb @@ -37,7 +37,7 @@ class DirectoriesController < ApplicationController end def set_accounts - @accounts = Account.discoverable.page(params[:page]).per(40).tap do |query| + @accounts = Account.discoverable.by_recent_status.page(params[:page]).per(40).tap do |query| query.merge!(Account.tagged_with(@tag.id)) if @tag end end |