diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-23 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 15:23:12 +0100 |
| commit | 8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch) | |
| tree | b5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/controllers/directories_controller.rb | |
| parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
| parent | cb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff) | |
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |