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
3b42c267
Commit
3b42c267
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont show blocked users in autocomplete
parent
07a88d66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+1
-0
lib/api/users.rb
lib/api/users.rb
+1
-0
No files found.
app/assets/javascripts/users_select.js.coffee
View file @
3b42c267
...
...
@@ -24,6 +24,7 @@ $ ->
data
:
(
term
,
page
)
->
search
:
term
# search term
per_page
:
10
active
:
true
private_token
:
gon
.
api_token
results
:
(
data
,
page
)
->
# parse the results into the format expected by Select2.
...
...
This diff is collapsed.
Click to expand it.
lib/api/users.rb
View file @
3b42c267
...
...
@@ -10,6 +10,7 @@ module Gitlab
# GET /users
get
do
@users
=
User
.
scoped
@users
=
@users
.
active
if
params
[
:active
].
present?
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
present
@users
,
with:
Entities
::
User
end
...
...
This diff is collapsed.
Click to expand it.
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