diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-06 16:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 16:23:57 +0100 |
| commit | b1983623aec8e0b066d115736d2151e0c74407fa (patch) | |
| tree | 45ef2112a99163aba4a2f65c02ec1c7604b249a3 /app/controllers/admin | |
| parent | 24d1ddcc24996d0b9de11fa725f0e15c78d59fba (diff) | |
| parent | aa832d623ac0812a970ea90440c50fca9a7bb616 (diff) | |
Merge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/relationships_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/relationships_controller.rb b/app/controllers/admin/relationships_controller.rb index f8a95cfc8..085ded21c 100644 --- a/app/controllers/admin/relationships_controller.rb +++ b/app/controllers/admin/relationships_controller.rb @@ -9,7 +9,8 @@ module Admin def index authorize :account, :index? - @accounts = RelationshipFilter.new(@account, filter_params).results.page(params[:page]).per(PER_PAGE) + @accounts = RelationshipFilter.new(@account, filter_params).results.includes(:account_stat, user: [:ips, :invite_request]).page(params[:page]).per(PER_PAGE) + @form = Form::AccountBatch.new end private |