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
a2c3d70b
Commit
a2c3d70b
authored
May 26, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add per page to user autocomplete (EE)
parent
7c6e62e9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-1
spec/controllers/autocomplete_controller_spec.rb
spec/controllers/autocomplete_controller_spec.rb
+14
-0
No files found.
app/controllers/autocomplete_controller.rb
View file @
a2c3d70b
...
@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController
...
@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController
@users
=
@users
.
where
.
not
(
id:
params
[
:skip_users
])
if
params
[
:skip_users
].
present?
@users
=
@users
.
where
.
not
(
id:
params
[
:skip_users
])
if
params
[
:skip_users
].
present?
@users
=
@users
.
active
@users
=
@users
.
active
@users
=
@users
.
reorder
(
:name
)
@users
=
@users
.
reorder
(
:name
)
@users
=
load_users_by_ability
||
@users
.
page
(
params
[
:page
])
@users
=
load_users_by_ability
||
@users
.
page
(
params
[
:page
])
.
per
(
params
[
:per_page
])
if
params
[
:todo_filter
].
present?
&&
current_user
if
params
[
:todo_filter
].
present?
&&
current_user
@users
=
@users
.
todo_authors
(
current_user
.
id
,
params
[
:todo_state_filter
])
@users
=
@users
.
todo_authors
(
current_user
.
id
,
params
[
:todo_state_filter
])
...
...
spec/controllers/autocomplete_controller_spec.rb
View file @
a2c3d70b
...
@@ -137,6 +137,20 @@ describe AutocompleteController do
...
@@ -137,6 +137,20 @@ describe AutocompleteController do
it
{
expect
(
body
.
size
).
to
eq
User
.
count
}
it
{
expect
(
body
.
size
).
to
eq
User
.
count
}
end
end
context
'limited users per page'
do
let
(
:per_page
)
{
2
}
before
do
sign_in
(
user
)
get
(
:users
,
per_page:
per_page
)
end
let
(
:body
)
{
JSON
.
parse
(
response
.
body
)
}
it
{
expect
(
body
).
to
be_kind_of
(
Array
)
}
it
{
expect
(
body
.
size
).
to
eq
per_page
}
end
context
'unauthenticated user'
do
context
'unauthenticated user'
do
let
(
:public_project
)
{
create
(
:project
,
:public
)
}
let
(
:public_project
)
{
create
(
:project
,
:public
)
}
let
(
:body
)
{
JSON
.
parse
(
response
.
body
)
}
let
(
:body
)
{
JSON
.
parse
(
response
.
body
)
}
...
...
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