Download as
Browse Code »

Commit af9a14c49cd0e33090765885eb0fa7abefac84ff

Authored by Jacob Vosmaer
1 parent dba98240
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Explain that `limit` only applies to the check

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @af9a14c
@@ -116,8 +116,8 @@ production: &base @@ -116,8 +116,8 @@ production: &base
116 # ========================== 116 # ==========================
117 117
118 ## LDAP settings 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 ldap: 121 ldap:
122 enabled: false 122 enabled: false
123 host: '_your_ldap_server' 123 host: '_your_ldap_server'
lib/tasks/gitlab/check.rake
  Diff comments   View file @af9a14c
@@ -682,6 +682,8 @@ namespace :gitlab do @@ -682,6 +682,8 @@ namespace :gitlab do
682 682
683 namespace :ldap do 683 namespace :ldap do
684 task :check, [:limit] => :environment do |t, args| 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 args.with_defaults(limit: 100) 687 args.with_defaults(limit: 100)
686 warn_user_is_not_gitlab 688 warn_user_is_not_gitlab
687 start_checking "LDAP" 689 start_checking "LDAP"