mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-27 13:36:06 +10:00
Dmitriy Zaporozhets
935fc796d1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION app/controllers/admin/application_settings_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/project_members_controller.rb app/helpers/application_settings_helper.rb app/models/user.rb app/services/files/base_service.rb app/views/profiles/accounts/show.html.haml db/schema.rb doc/install/installation.md doc/update/6.x-or-7.x-to-7.11.md doc/workflow/README.md lib/gitlab/markdown/external_issue_reference_filter.rb lib/gitlab/reference_extractor.rb lib/gitlab/upgrader.rb
23 lines
777 B
Ruby
23 lines
777 B
Ruby
if Gitlab::LDAP::Config.enabled?
|
|
module OmniAuth::Strategies
|
|
Gitlab::LDAP::Config.servers.each do |server|
|
|
# do not redeclare LDAP
|
|
next if server['provider_name'] == 'ldap'
|
|
const_set(server['provider_class'], Class.new(LDAP))
|
|
end
|
|
end
|
|
|
|
OmniauthCallbacksController.class_eval do
|
|
Gitlab::LDAP::Config.servers.each do |server|
|
|
alias_method server['provider_name'], :ldap
|
|
end
|
|
end
|
|
end
|
|
|
|
OmniAuth.config.allowed_request_methods = [:post]
|
|
#In case of auto sign-in, the GET method is used (users don't get to click on a button)
|
|
OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
|
|
OmniAuth.config.before_request_phase do |env|
|
|
OmniAuth::RequestForgeryProtection.new(env).call
|
|
end
|