summaryrefslogtreecommitdiff
path: root/app/controllers/ldap
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2018-04-23 16:03:01 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2018-04-23 16:24:47 +0100
commit795cd7f95206db318c58939698f63eee5abedb34 (patch)
treef8e244b3ea6b80acb64b724b0aef04af3b5c4fa8 /app/controllers/ldap
parentd3a8a07423dccf1709b6432e017ae4679143dbce (diff)
downloadgitlab-ce-795cd7f95206db318c58939698f63eee5abedb34.tar.gz
Replace define_method with alias_method in Omniauth Controllers
Diffstat (limited to 'app/controllers/ldap')
-rw-r--r--app/controllers/ldap/omniauth_callbacks_controller.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/app/controllers/ldap/omniauth_callbacks_controller.rb b/app/controllers/ldap/omniauth_callbacks_controller.rb
index e9219274182..fb24edb8602 100644
--- a/app/controllers/ldap/omniauth_callbacks_controller.rb
+++ b/app/controllers/ldap/omniauth_callbacks_controller.rb
@@ -2,23 +2,21 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
extend ::Gitlab::Utils::Override
def self.define_providers!
- if Gitlab::Auth::LDAP::Config.enabled?
- Gitlab::Auth::LDAP::Config.available_servers.each do |server|
- define_method server['provider_name'] do
- ldap
- end
- end
+ return unless Gitlab::Auth::LDAP::Config.enabled?
+
+ Gitlab::Auth::LDAP::Config.available_servers.each do |server|
+ alias_method server['provider_name'], :ldap
end
end
- define_providers!
-
# We only find ourselves here
# if the authentication to LDAP was successful.
def ldap
sign_in_user_flow(Gitlab::Auth::LDAP::User)
end
+ define_providers!
+
override :set_remember_me
def set_remember_me(user)
user.remember_me = params[:remember_me] if user.persisted?