diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-23 12:49:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 12:49:09 +0200 |
| commit | 776e00f19399875a135a64d8ad486f3578101cf9 (patch) | |
| tree | ea846e21767b1cb2f9f277d3829fbade1f0e46a0 /app/models/concerns | |
| parent | a434f370f38ac66e05000545e36d7c696f4962d0 (diff) | |
| parent | 979059fbc93664b38b720b369b31beaa89457879 (diff) | |
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/ldap_authenticable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/ldap_authenticable.rb b/app/models/concerns/ldap_authenticable.rb index e3f94bb6c..dc5abcd5a 100644 --- a/app/models/concerns/ldap_authenticable.rb +++ b/app/models/concerns/ldap_authenticable.rb @@ -15,10 +15,10 @@ module LdapAuthenticable def ldap_get_user(attributes = {}) safe_username = attributes[Devise.ldap_uid.to_sym].first + if Devise.ldap_uid_conversion_enabled keys = Regexp.union(Devise.ldap_uid_conversion_search.chars) replacement = Devise.ldap_uid_conversion_replace - safe_username = safe_username.gsub(keys, replacement) end |