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
Léo-Paul Géneau
gitlab-ce
Commits
c61b6eeb
Commit
c61b6eeb
authored
Sep 15, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9634 from allistera/users-autocomplete-sort-order
Sorted autocomplete users list by name
parents
db665829
c9389d0e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CHANGELOG
CHANGELOG
+1
-0
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-0
No files found.
CHANGELOG
View file @
c61b6eeb
...
@@ -48,6 +48,7 @@ v 8.0.0 (unreleased)
...
@@ -48,6 +48,7 @@ v 8.0.0 (unreleased)
- Fix highlighting of deleted lines in diffs.
- Fix highlighting of deleted lines in diffs.
- Added service API endpoint to retrieve service parameters (Petheő Bence)
- Added service API endpoint to retrieve service parameters (Petheő Bence)
- Add FogBugz project import (Jared Szechy)
- Add FogBugz project import (Jared Szechy)
- Sort users autocomplete lists by user (Allister Antosik)
v 7.14.3
v 7.14.3
- No changes
- No changes
...
...
app/controllers/autocomplete_controller.rb
View file @
c61b6eeb
...
@@ -32,6 +32,7 @@ class AutocompleteController < ApplicationController
...
@@ -32,6 +32,7 @@ class AutocompleteController < ApplicationController
@users
||=
User
.
none
@users
||=
User
.
none
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
@users
.
active
@users
=
@users
.
active
@users
=
@users
.
reorder
(
:name
)
@users
=
@users
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@users
=
@users
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
unless
params
[
:search
].
present?
unless
params
[
:search
].
present?
...
...
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