Commit cdb3114b authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '285442-mentioning-users-is-now-very-slow' into 'master'

Resolve "Mentioning users is now very slow"

See merge request gitlab-org/gitlab!48217
parents cf02ace2 6c27e9c5
...@@ -42,7 +42,7 @@ export function membersBeforeSave(members) { ...@@ -42,7 +42,7 @@ export function membersBeforeSave(members) {
title: sanitize(title), title: sanitize(title),
search: sanitize(`${member.username} ${member.name}`), search: sanitize(`${member.username} ${member.name}`),
icon: avatarIcon, icon: avatarIcon,
availability: member.availability, availability: member?.availability,
}; };
}); });
} }
......
...@@ -46,8 +46,9 @@ module Users ...@@ -46,8 +46,9 @@ module Users
username: user.username, username: user.username,
name: user.name, name: user.name,
avatar_url: user.avatar_url, avatar_url: user.avatar_url,
availability: user&.status&.availability availability: nil
} }
# Return nil for availability for now due to https://gitlab.com/gitlab-org/gitlab/-/issues/285442
end end
def group_as_hash(group, group_counts) def group_as_hash(group, group_counts)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment