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
4d7ead9b
Commit
4d7ead9b
authored
Mar 10, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '29316-can-t-select-a-mirror-user' into 'master'
Resolve "Can't select a mirror user" See merge request !9854
parents
004b2528
5c0f6c85
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-2
No files found.
app/controllers/autocomplete_controller.rb
View file @
4d7ead9b
...
...
@@ -18,8 +18,7 @@ class AutocompleteController < ApplicationController
if
params
[
:search
].
blank?
# Include current user if available to filter by "Me"
if
params
[
:current_user
].
present?
&&
current_user
@users
=
@users
.
where
.
not
(
id:
current_user
.
id
)
@users
=
[
current_user
,
*
@users
]
@users
=
[
current_user
,
*
@users
].
uniq
end
if
params
[
:author_id
].
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