diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-23 11:28:28 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-23 11:28:28 +0100 |
commit | 3e686beaea1931c76c778d8ca6b03c41caaf69db (patch) | |
tree | f659a52ba0245daf2c7776e63c3a5012f906552a /app/controllers/directories_controller.rb | |
parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
parent | e25947db4a44cd50fa1daa36d5031a950327b646 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.
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 e91e784a5..4f0f1380c 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(30).tap do |query| + @accounts = Account.discoverable.page(params[:page]).per(40).tap do |query| query.merge!(Account.tagged_with(@tag.id)) if @tag end end |