summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-28 18:12:30 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-28 18:12:30 +0100
commit376cfc6ac68da97af33dfdc1a17e75ab157f5b59 (patch)
treeab488a99922147e8455551201e641420061f3893 /lib
parent47239aabef2619dba34e2702588bdbc70234c6f4 (diff)
downloadgitlab-ce-376cfc6ac68da97af33dfdc1a17e75ab157f5b59.tar.gz
Give more information in rake gitlab:ldap:check
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/check.rake8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 5f6856a63e3..1cea4ff806c 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -682,12 +682,14 @@ namespace :gitlab do
namespace :ldap do
task check: :environment do
- next unless ldap_config.enabled
-
warn_user_is_not_gitlab
start_checking "LDAP"
- print_users
+ if ldap_config.enabled
+ print_users
+ else
+ puts 'LDAP is disabled in config/gitlab.yml'
+ end
finished_checking "LDAP"
end