diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-02 00:08:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-02 00:08:18 +0300 |
| commit | 61666f277a484725307ae2b34697b13a300b2129 (patch) | |
| tree | 01f93083ca2cb9d0eeca1443a23c31a4bdbd5532 /lib/gitlab/auth | |
| parent | 4e3a998b8ec1351d8345863f6cad4b9bd497bd6a (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 | ||||
| -rw-r--r-- | lib/gitlab/auth/ldap/adapter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth/ldap/access.rb b/lib/gitlab/auth/ldap/access.rb index 62a817d7c4d..ea098ff8057 100644 --- a/lib/gitlab/auth/ldap/access.rb +++ b/lib/gitlab/auth/ldap/access.rb @@ -12,7 +12,7 @@ module Gitlab def self.open(user, &block) Gitlab::Auth::Ldap::Adapter.open(user.ldap_identity.provider) do |adapter| - block.call(self.new(user, adapter)) + yield(self.new(user, adapter)) end end diff --git a/lib/gitlab/auth/ldap/adapter.rb b/lib/gitlab/auth/ldap/adapter.rb index 47eca74aa5b..9aedc131e92 100644 --- a/lib/gitlab/auth/ldap/adapter.rb +++ b/lib/gitlab/auth/ldap/adapter.rb @@ -11,7 +11,7 @@ module Gitlab def self.open(provider, &block) Net::LDAP.open(config(provider).adapter_options) do |ldap| - block.call(self.new(provider, ldap)) + yield(self.new(provider, ldap)) end end |