Download as
Browse Code »

Commit 4d7792bc388d72a8ce6c2f84e102ba68a28dae81

Authored by Dmitriy Zaporozhets
2 parents d435fbb9 af9a14c4
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'explain_ldap_check' into 'master' 

Improve the explanation of the LDAP check script
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @4d7792b
... ... @@ -116,8 +116,8 @@ production: &base
116 116 # ==========================
117 117  
118 118 ## LDAP settings
119   - # You can inspect the first 100 LDAP users with login access by running:
120   - # bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production
  119 + # You can inspect a sample of the LDAP users with login access by running:
  120 + # bundle exec rake gitlab:ldap:check RAILS_ENV=production
121 121 ldap:
122 122 enabled: false
123 123 host: '_your_ldap_server'
... ...
lib/tasks/gitlab/check.rake
  Diff comments   View file @4d7792b
... ... @@ -682,6 +682,8 @@ namespace :gitlab do
682 682  
683 683 namespace :ldap do
684 684 task :check, [:limit] => :environment do |t, args|
  685 + # Only show up to 100 results because LDAP directories can be very big.
  686 + # This setting only affects the `rake gitlab:check` script.
685 687 args.with_defaults(limit: 100)
686 688 warn_user_is_not_gitlab
687 689 start_checking "LDAP"
... ...