Merge branch 'main' into feature/add-menu-to-assigned-text-on-posts

discourse · Mar 14, 2024 · e25476a · e25476a
2 parents f9859e7 + a1686e1
commit e25476a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.discourse-compatibility b/.discourse-compatibility
@@ -1,4 +1,5 @@
 < 3.3.0.beta1-dev: 56b0de3896361b6a87523537c8f5b450d2fe0807
+3.2.0: 33c43ca51ac7b7baa8a309a269dcf8685b8bd638
 < 3.2.0.beta2-dev: ac930c509e2a5b0c37b84bcea28d332e686add95
 3.1.999: a304cd2028ccf1f5b00f5137633aa7027a1fd334
 3.1.0.beta3: 9c270cac9abc1c2b30574d8c655fb3a90546236b

diff --git a/app/controllers/discourse_assign/assign_controller.rb b/app/controllers/discourse_assign/assign_controller.rb
@@ -8,9 +8,6 @@ class AssignController < ApplicationController
 
     def suggestions
       users = [current_user, *recent_assignees]
-      each_serializer =
-        SiteSetting.enable_user_status? ? FoundUserWithStatusSerializer : FoundUserSerializer
-
       render json: {
                assign_allowed_on_groups:
                  Group.visible_groups(current_user).assign_allowed_groups.pluck(:name),
@@ -20,7 +17,8 @@ def suggestions
                  ActiveModel::ArraySerializer.new(
                    users,
                    scope: guardian,
-                   each_serializer: each_serializer,
+                   each_serializer: FoundUserSerializer,
+                   include_status: true,
                  ),
              }
     end