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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
8b1914ce
Commit
8b1914ce
authored
Jan 04, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the failing spec in POST /users API
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
042bcdd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
changelogs/unreleased/fix-users-api-500-error.yml
changelogs/unreleased/fix-users-api-500-error.yml
+4
-0
lib/api/users.rb
lib/api/users.rb
+4
-7
No files found.
changelogs/unreleased/fix-users-api-500-error.yml
0 → 100644
View file @
8b1914ce
---
title
:
Fix 500 errors when creating a user with identity via API
merge_request
:
8442
author
:
lib/api/users.rb
View file @
8b1914ce
...
...
@@ -91,10 +91,11 @@ module API
authenticated_as_admin!
# Filter out params which are used later
identity_attrs
=
params
.
slice
(
:provider
,
:extern_uid
)
user_params
=
declared_params
(
include_missing:
false
)
identity_attrs
=
user_params
.
slice
(
:provider
,
:extern_uid
)
confirm
=
params
.
delete
(
:confirm
)
user
=
User
.
new
(
declared_params
(
include_missing:
false
))
user
=
User
.
new
(
user_params
.
except
(
:extern_uid
,
:provider
))
user
.
skip_confirmation!
unless
confirm
if
identity_attrs
.
any?
...
...
@@ -159,11 +160,7 @@ module API
end
end
# Delete already handled parameters
user_params
.
delete
(
:extern_uid
)
user_params
.
delete
(
:provider
)
if
user
.
update_attributes
(
user_params
)
if
user
.
update_attributes
(
user_params
.
except
(
:extern_uid
,
:provider
))
present
user
,
with:
Entities
::
UserPublic
else
render_validation_error!
(
user
)
...
...
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