Commit 8ee644bf authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' into 'master'

Fixing typo



See merge request !1014
parents 58b3f18f 627f694a
......@@ -101,7 +101,7 @@ external_url 'GENERATED_EXTERNAL_URL'
## For setting up LDAP
## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#setting-up-ldap-sign-in
## Be careful not to break the identation in the ldap_servers block. It is in
## Be careful not to break the indentation in the ldap_servers block. It is in
## yaml format and the spaces must be retained. Using tabs will not work.
# gitlab_rails['ldap_enabled'] = false
......
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