diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:35:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:35:08 +0000 |
| commit | 936be025cde7fad6857410ef2cd842f2b1fc2a67 (patch) | |
| tree | e2dd3aa5623b8a6f112cecaab683e655e2967303 /app | |
| parent | 730625f022b1c3b9394cf944f04968a29ac8dc36 (diff) | |
| parent | 8110e7530902de8744ff985f08938306e2c38367 (diff) | |
| download | gitlab-ce-936be025cde7fad6857410ef2cd842f2b1fc2a67.tar.gz | |
Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such
Related to #4009
Fixes #14577
This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.
See merge request !3530
Diffstat (limited to 'app')
| -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 |