diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-04-08 15:48:09 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-04-08 15:48:09 -0300 |
| commit | 7afeace35474249c9aeb898f3a56180745106169 (patch) | |
| tree | 36bd5104fb42d739b54378fc2fb5e0cc9714e538 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 877f56c9370eef9affef3cc3438c5d4fe11b123c (diff) | |
| parent | 0d216c194c5a7b72c98f0f06b4fc7fd0ba358c0e (diff) | |
| download | gitlab-ce-7afeace35474249c9aeb898f3a56180745106169.tar.gz | |
Merge branch 'master' into decouple-member-notification
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 21135f7d607..d28e96c3f18 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -55,7 +55,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end else saml_user = Gitlab::Saml::User.new(oauth) - saml_user.save + saml_user.save if saml_user.changed? @user = saml_user.gl_user continue_login_process |