summaryrefslogtreecommitdiff
path: root/app/controllers/omniauth_callbacks_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-05 14:37:01 +0200
committerDouwe Maan <douwe@gitlab.com>2015-06-05 14:37:01 +0200
commit44458f3ca2d142a7d6088d627382f9dab5698f40 (patch)
treea0a5e0540feac202be2f7d2398001f99bf44842a /app/controllers/omniauth_callbacks_controller.rb
parent3f59a8f0be101c2405372d05a304540beb1b6d01 (diff)
downloadgitlab-ce-44458f3ca2d142a7d6088d627382f9dab5698f40.tar.gz
Add "Remember me" checkbox to LDAP signin form.ldap-remember-me
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index a767815b311..765adaf2128 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -24,7 +24,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
@user = Gitlab::LDAP::User.new(oauth)
@user.save if @user.changed? # will also save new users
gl_user = @user.gl_user
- gl_user.remember_me = true if @user.persisted?
+ gl_user.remember_me = params[:remember_me] if @user.persisted?
# Do additional LDAP checks for the user filter and EE features
if @user.allowed?