diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-11 16:45:58 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-11 16:45:58 -0500 |
| commit | 44727525952f22c2234d2991e20f4f4f8bac3221 (patch) | |
| tree | c34babda3b6b6014f8a05870922fe8f4855983cf /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 38a4f5cec6ab85525ab9db1d7d2669a77171f768 (diff) | |
| parent | 7998725e3c2557c04ceece028dd73a316a3a746c (diff) | |
| download | gitlab-ce-issue_14206.tar.gz | |
Merge branch 'master' into issue_14206issue_14206
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 |