Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
aa2952ec
Commit
aa2952ec
authored
Mar 13, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
8bbd8172
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
ee/lib/api/scim.rb
ee/lib/api/scim.rb
+2
-0
ee/lib/ee/api/helpers.rb
ee/lib/ee/api/helpers.rb
+1
-1
No files found.
ee/lib/api/scim.rb
View file @
aa2952ec
...
...
@@ -36,6 +36,8 @@ module API
# rubocop: disable CodeReuse/ActiveRecord
def
email_taken?
(
email
,
identity
)
return
unless
email
User
.
by_any_email
(
email
.
downcase
).
where
.
not
(
id:
identity
.
user
.
id
).
count
>
0
end
# rubocop: enable CodeReuse/ActiveRecord
...
...
ee/lib/ee/api/helpers.rb
View file @
aa2952ec
...
...
@@ -136,7 +136,7 @@ module EE
end
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
def
check_group_saml_configured
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment