From 198e404eb0657f4973a2d5baa37021180331fc32 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Thu, 27 Nov 2025 11:33:49 -0500
Subject: [PATCH] Avoid N+1 on account and board settings pages

---
 app/controllers/account/settings_controller.rb | 2 +-
 app/controllers/boards_controller.rb           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/account/settings_controller.rb b/app/controllers/account/settings_controller.rb
index a076479cb..27f47ab99 100644
--- a/app/controllers/account/settings_controller.rb
+++ b/app/controllers/account/settings_controller.rb
@@ -3,7 +3,7 @@ class Account::SettingsController < ApplicationController
   before_action :set_account
 
   def show
-    @users = @account.users.active.alphabetically
+    @users = @account.users.active.alphabetically.includes(:identity)
   end
 
   def update
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 258bffc1a..1e4233696 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -24,7 +24,7 @@ class BoardsController < ApplicationController
   def edit
     selected_user_ids = @board.users.pluck :id
     @selected_users, @unselected_users = \
-      @board.account.users.active.alphabetically.partition { |user| selected_user_ids.include? user.id }
+      @board.account.users.active.alphabetically.includes(:identity).partition { |user| selected_user_ids.include? user.id }
   end
 
   def update