Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-08 12:58:48 +0300
committerDouwe Maan <douwe@gitlab.com>2015-09-08 18:18:14 +0300
commitc915e2c8237ddcae57ec48e700badd9d5bfd8c8c (patch)
tree045b66c46a9af2022734ccf390ccd979f2ddb07a /lib/gitlab/ldap/user.rb
parente0da2c352325c1cb2ede88a73434ed7afc037481 (diff)
Allow configuration of LDAP attributes GitLab will use for the new user account.
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
-rw-r--r--lib/gitlab/ldap/user.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index 04a22237478..e568b0e3b31 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -71,6 +71,10 @@ module Gitlab
def ldap_config
Gitlab::LDAP::Config.new(auth_hash.provider)
end
+
+ def auth_hash=(auth_hash)
+ @auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash, ldap_config)
+ end
end
end
end