mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-20 01:56:06 +10:00
Merge branch 'issue-ldap-initialization' into 'master'
Issue ldap initialization If LDAP is disabled error will appear: ``` ERROR -- : Missing setting 'servers' in 'ldap' section in /Volumes/Work/gitlab/development/community/gitlab/config/gitlab.yml (Settingslogic::MissingSetting) ``` @marin Can you test if this will solve the startup problem? See merge request !1179
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
module OmniAuth::Strategies
|
||||
server = Gitlab.config.ldap.servers.values.first
|
||||
const_set(server['provider_class'], Class.new(LDAP))
|
||||
end
|
||||
if Gitlab::LDAP::Config.enabled?
|
||||
module OmniAuth::Strategies
|
||||
server = Gitlab.config.ldap.servers.values.first
|
||||
const_set(server['provider_class'], Class.new(LDAP))
|
||||
end
|
||||
|
||||
OmniauthCallbacksController.class_eval do
|
||||
server = Gitlab.config.ldap.servers.values.first
|
||||
alias_method server['provider_name'], :ldap
|
||||
OmniauthCallbacksController.class_eval do
|
||||
server = Gitlab.config.ldap.servers.values.first
|
||||
alias_method server['provider_name'], :ldap
|
||||
end
|
||||
end
|
||||
@@ -204,7 +204,7 @@ Devise.setup do |config|
|
||||
# manager.default_strategies(scope: :user).unshift :some_external_strategy
|
||||
# end
|
||||
|
||||
if Gitlab.config.ldap.enabled
|
||||
if Gitlab::LDAP::Config.enabled?
|
||||
Gitlab.config.ldap.servers.values.each do |server|
|
||||
if server['allow_username_or_email_login']
|
||||
email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
|
||||
|
||||
Reference in New Issue
Block a user