Merge remote-tracking branch 'parent/main' into upstream-20240507

2024-05-07 08:05:04 +09:00 · 2024-05-07 08:05:04 +09:00 · 89b71363ae
commit 89b71363ae
parent bab1a792a7 6167894547
70 changed files with 1739 additions and 445 deletions
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@ -22,7 +22,7 @@ module User::LdapAuthenticable
        safe_username = safe_username.gsub(keys, replacement)
      end

-      resource = joins(:account).find_by(accounts: { username: safe_username })
+      resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take

      if resource.blank?
        resource = new(