Skip to content

G
gitlab-ce
Commit f0e4ac45 authored by Marcia Ramos's avatar Marcia Ramos
Browse files
Options

fix conflict in doc/administration/auth/ldap.md

parent e98621f0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/administration/auth/ldap.md
View file @ f0e4ac45
...@@ -49,10 +49,7 @@ in the application settings. ...@@ -49,10 +49,7 @@ in the application settings.
For a complete guide on configuring LDAP with GitLab Community Edition, please check For a complete guide on configuring LDAP with GitLab Community Edition, please check
the admin guide [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md). the admin guide [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md).
<<<<<<< HEAD
For GitLab Enterprise Editions, see also [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md). For GitLab Enterprise Editions, see also [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md).
=======
>>>>>>> upstream/master
To enable LDAP integration you need to add your LDAP server settings in To enable LDAP integration you need to add your LDAP server settings in
`/etc/gitlab/gitlab.rb` or `/home/git/gitlab/config/gitlab.yml`. `/etc/gitlab/gitlab.rb` or `/home/git/gitlab/config/gitlab.yml`.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7