Commit 8e04450c authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '9201-create-a-user-via-scim-ce' into 'master'

[CE] Add saml provider to user build service (Backport EE 10456)

See merge request gitlab-org/gitlab-ce!26903
parents 9fb1dfa8 ac07c066
...@@ -26,7 +26,7 @@ module Users ...@@ -26,7 +26,7 @@ module Users
end end
end end
identity_attrs = params.slice(:extern_uid, :provider) identity_attrs = params.slice(*identity_params)
unless identity_attrs.empty? unless identity_attrs.empty?
user.identities.build(identity_attrs) user.identities.build(identity_attrs)
...@@ -37,6 +37,10 @@ module Users ...@@ -37,6 +37,10 @@ module Users
private private
def identity_params
[:extern_uid, :provider]
end
def can_create_user? def can_create_user?
(current_user.nil? && Gitlab::CurrentSettings.allow_signup?) || current_user&.admin? (current_user.nil? && Gitlab::CurrentSettings.allow_signup?) || current_user&.admin?
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment