Merge branch 'document_user_filter' of /home/git/repositories/gitlab/gitlab-ee

58dfbb89 · Dmitriy Zaporozhets · 939218d7 · 1ecf66fb · 58dfbb89
Commit 58dfbb89 authored Oct 14, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

config/gitlab.yml.example config/gitlab.yml.example +1 -0

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -116,6 +116,7 @@ production: &base

    # Filter LDAP users
    #
+    #   Format: RFC 4515
    #   Ex. (employeeType=developer)
    #
    user_filter: ''