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
5524971c
Commit
5524971c
authored
Mar 25, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update code based on feedback
parent
77adc81f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ee/lib/api/scim.rb
ee/lib/api/scim.rb
+1
-1
ee/lib/ee/gitlab/scim/params_parser.rb
ee/lib/ee/gitlab/scim/params_parser.rb
+1
-1
ee/spec/requests/api/scim_spec.rb
ee/spec/requests/api/scim_spec.rb
+1
-1
No files found.
ee/lib/api/scim.rb
View file @
5524971c
...
...
@@ -21,7 +21,7 @@ module API
true
rescue
=>
e
logger
.
error
(
e
.
message
)
logger
.
error
(
identity:
identity
,
error:
e
.
class
.
name
,
message:
e
.
message
,
source:
"
#{
__FILE__
}
:
#{
__LINE__
}
"
)
false
end
...
...
ee/lib/ee/gitlab/scim/params_parser.rb
View file @
5524971c
...
...
@@ -12,7 +12,7 @@ module EE
'name.formatted'
:
:name
,
'emails[type eq "work"].value'
:
:email
,
active: :active
}.
with_indifferent_access
}.
with_indifferent_access
.
freeze
COERCED_VALUES
=
{
'True'
=>
true
,
...
...
ee/spec/requests/api/scim_spec.rb
View file @
5524971c
...
...
@@ -125,7 +125,7 @@ describe API::Scim do
end
end
describe
'DELETE/scim/v2/groups/:group/Users/:id'
do
describe
'DELETE
/scim/v2/groups/:group/Users/:id'
do
context
'existing user'
do
before
do
delete
scim_api
(
"scim/v2/groups/
#{
group
.
full_path
}
/Users/
#{
identity
.
extern_uid
}
"
)
...
...
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