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
Jérome Perrin
gitlab-ce
Commits
15932c36
Commit
15932c36
authored
Jan 03, 2017
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API: extern_uid is a string
parent
8dc2163c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/api/users.rb
lib/api/users.rb
+1
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+2
-2
No files found.
lib/api/users.rb
View file @
15932c36
...
@@ -16,7 +16,7 @@ module API
...
@@ -16,7 +16,7 @@ module API
optional
:website_url
,
type:
String
,
desc:
'The website of the user'
optional
:website_url
,
type:
String
,
desc:
'The website of the user'
optional
:organization
,
type:
String
,
desc:
'The organization of the user'
optional
:organization
,
type:
String
,
desc:
'The organization of the user'
optional
:projects_limit
,
type:
Integer
,
desc:
'The number of projects a user can create'
optional
:projects_limit
,
type:
Integer
,
desc:
'The number of projects a user can create'
optional
:extern_uid
,
type:
Integer
,
desc:
'The external authentication provider UID'
optional
:extern_uid
,
type:
String
,
desc:
'The external authentication provider UID'
optional
:provider
,
type:
String
,
desc:
'The external provider'
optional
:provider
,
type:
String
,
desc:
'The external provider'
optional
:bio
,
type:
String
,
desc:
'The biography of the user'
optional
:bio
,
type:
String
,
desc:
'The biography of the user'
optional
:location
,
type:
String
,
desc:
'The location of the user'
optional
:location
,
type:
String
,
desc:
'The location of the user'
...
...
spec/requests/api/users_spec.rb
View file @
15932c36
...
@@ -317,9 +317,9 @@ describe API::Users, api: true do
...
@@ -317,9 +317,9 @@ describe API::Users, api: true do
end
end
it
'updates user with new identity'
do
it
'updates user with new identity'
do
put
api
(
"/users/
#{
user
.
id
}
"
,
admin
),
provider:
'github'
,
extern_uid:
'
67890
'
put
api
(
"/users/
#{
user
.
id
}
"
,
admin
),
provider:
'github'
,
extern_uid:
'
john
'
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
user
.
reload
.
identities
.
first
.
extern_uid
).
to
eq
(
'
67890
'
)
expect
(
user
.
reload
.
identities
.
first
.
extern_uid
).
to
eq
(
'
john
'
)
expect
(
user
.
reload
.
identities
.
first
.
provider
).
to
eq
(
'github'
)
expect
(
user
.
reload
.
identities
.
first
.
provider
).
to
eq
(
'github'
)
end
end
...
...
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