diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /doc/administration/troubleshooting | |
parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
download | gitlab-ce-dc889678d1de8c09310b2f8f9742bb6c78a6f1a4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/troubleshooting')
-rw-r--r-- | doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 16eb3269ef0..2bb2e13511c 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -626,7 +626,7 @@ EE::Gitlab::LDAP::Sync::Group.execute_all_providers(group) # Run a GroupSync for a single group (10.6+) group = Group.find_by(name: 'my_gitlab_group') -EE::Gitlab::Auth::LDAP::Sync::Group.execute_all_providers(group) +EE::Gitlab::Auth::Ldap::Sync::Group.execute_all_providers(group) # Query an LDAP group directly (10.6-) adapter = Gitlab::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider @@ -635,20 +635,20 @@ ldap_group.member_dns ldap_group.member_uids # Query an LDAP group directly (10.6+) -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider -ldap_group = EE::Gitlab::Auth::LDAP::Group.find_by_cn('group_cn_here', adapter) +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') # If `main` is the LDAP provider +ldap_group = EE::Gitlab::Auth::Ldap::Group.find_by_cn('group_cn_here', adapter) ldap_group.member_dns ldap_group.member_uids # Lookup a particular user (10.6+) # This could expose potential errors connecting to and/or querying LDAP that may seem to # fail silently in the GitLab UI -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') # If `main` is the LDAP provider -user = Gitlab::Auth::LDAP::Person.find_by_uid('<username>',adapter) +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') # If `main` is the LDAP provider +user = Gitlab::Auth::Ldap::Person.find_by_uid('<username>',adapter) # Query the LDAP server directly (10.6+) ## For an example, see https://gitlab.com/gitlab-org/gitlab/blob/master/ee/lib/ee/gitlab/auth/ldap/adapter.rb -adapter = Gitlab::Auth::LDAP::Adapter.new('ldapmain') +adapter = Gitlab::Auth::Ldap::Adapter.new('ldapmain') options = { # the :base is required # use adapter.config.base for the base or .group_base for the group_base |