diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 18:09:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 18:09:52 +0300 |
| commit | e43077ab4742ba5083a01a1e5341db1a1b7a1701 (patch) | |
| tree | c33a00fb176caff735243c484bbd594a3b08bb6e /lib/gitlab/auth | |
| parent | 211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/ldap/access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/ldap/access.rb b/lib/gitlab/auth/ldap/access.rb index b8ed740e08c..940b802be7e 100644 --- a/lib/gitlab/auth/ldap/access.rb +++ b/lib/gitlab/auth/ldap/access.rb @@ -49,7 +49,7 @@ module Gitlab return true end - # Block user in GitLab if he/she was blocked in AD + # Block user in GitLab if they were blocked in AD if Gitlab::Auth::LDAP::Person.disabled_via_active_directory?(ldap_identity.extern_uid, adapter) block_user(user, 'is disabled in Active Directory') false |