diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 14:14:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 14:14:05 +0000 |
| commit | 4d7792bc388d72a8ce6c2f84e102ba68a28dae81 (patch) | |
| tree | d2afabda7c3003af8e22de9d5ec6391d2ba480fe | |
| parent | d435fbb9b223c035e9d32e5746a4f9bc092e5dce (diff) | |
| parent | af9a14c49cd0e33090765885eb0fa7abefac84ff (diff) | |
| download | gitlab-ce-4d7792bc388d72a8ce6c2f84e102ba68a28dae81.tar.gz | |
Merge branch 'explain_ldap_check' into 'master'
Improve the explanation of the LDAP check script
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 52548106b0c..f628ac9121f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -116,8 +116,8 @@ production: &base # ========================== ## LDAP settings - # You can inspect the first 100 LDAP users with login access by running: - # bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production + # You can inspect a sample of the LDAP users with login access by running: + # bundle exec rake gitlab:ldap:check RAILS_ENV=production ldap: enabled: false host: '_your_ldap_server' diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 20d5f03d6ef..461e70ea44e 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -682,6 +682,8 @@ namespace :gitlab do namespace :ldap do task :check, [:limit] => :environment do |t, args| + # Only show up to 100 results because LDAP directories can be very big. + # This setting only affects the `rake gitlab:check` script. args.with_defaults(limit: 100) warn_user_is_not_gitlab start_checking "LDAP" |