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
d64ec096
Commit
d64ec096
authored
Apr 13, 2020
by
Blair Lunceford
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added the edits
parent
31ebf14e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
doc/api/users.md
doc/api/users.md
+1
-1
lib/api/users.rb
lib/api/users.rb
+1
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+0
-2
No files found.
doc/api/users.md
View file @
d64ec096
...
...
@@ -75,7 +75,7 @@ GET /users
|
`order_by`
| string | no | Return users ordered by
`id`
,
`name`
,
`username`
,
`created_at`
, or
`updated_at`
fields. Default is
`id`
|
|
`sort`
| string | no | Return users sorted in
`asc`
or
`desc`
order. Default is
`desc`
|
|
`two_factor`
| string | no | Filter users by Two-factor authentication. Filter values are
`enabled`
or
`disabled`
. By default it returns all users |
|
`without_projects`
| boolean | no | Filter users without projects |
|
`without_projects`
| boolean | no | Filter users without projects
. Default is
`false`
|
```
json
[
...
...
lib/api/users.rb
View file @
d64ec096
...
...
@@ -82,7 +82,7 @@ module API
optional
:blocked
,
type:
Boolean
,
default:
false
,
desc:
'Filters only blocked users'
optional
:created_after
,
type:
DateTime
,
desc:
'Return users created after the specified time'
optional
:created_before
,
type:
DateTime
,
desc:
'Return users created before the specified time'
optional
:without_projects
,
type:
Boolean
,
desc:
'Filters only users without projects'
optional
:without_projects
,
type:
Boolean
,
de
fault:
false
,
de
sc:
'Filters only users without projects'
all_or_none_of
:extern_uid
,
:provider
use
:sort_params
...
...
spec/requests/api/users_spec.rb
View file @
d64ec096
...
...
@@ -281,8 +281,6 @@ describe API::Users, :do_not_mock_admin_mode do
end
it
"returns users without projects"
do
admin
user
user_without_projects
=
create
(
:user
)
create
(
:project
,
namespace:
user
.
namespace
)
create
(
:project
,
namespace:
admin
.
namespace
)
...
...
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