Commit aa2952ec authored by James Lopez's avatar James Lopez

Fix specs

parent 8bbd8172
...@@ -36,6 +36,8 @@ module API ...@@ -36,6 +36,8 @@ module API
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def email_taken?(email, identity) def email_taken?(email, identity)
return unless email
User.by_any_email(email.downcase).where.not(id: identity.user.id).count > 0 User.by_any_email(email.downcase).where.not(id: identity.user.id).count > 0
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
...@@ -136,7 +136,7 @@ module EE ...@@ -136,7 +136,7 @@ module EE
end end
def check_group_scim_enabled(group) def check_group_scim_enabled(group)
forbidden!('Group SCIM not enabled.') unless Feature.enabled?(:group_scim, group) forbidden!('Group SCIM not enabled.') unless ::Feature.enabled?(:group_scim, group)
end end
def check_group_saml_configured def check_group_saml_configured
......
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