Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b832f00d1dd7
Commit
70f52918
authored
Aug 06, 2015
by
Stan Hu
Browse files
Always add current user to autocomplete controller to support filter by "Me"
Partial fix #2202
parent
5f936c4654e7
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
b832f00d
Please view this file on the master branch, on stable branches it's out of date.
v 7.14.0 (unreleased)
- Always add current user to autocomplete controller to support filter by "Me" (Stan Hu)
- Fix multi-line syntax highlighting (Stan Hu)
- Fix network graph when branch name has single quotes (Stan Hu)
- Add "Confirm user" button in user admin page (Stan Hu)
...
...
app/controllers/autocomplete_controller.rb
View file @
b832f00d
...
...
@@ -33,6 +33,8 @@ def users
@users
=
@users
.
search
(
params
[
:search
])
if
params
[
:search
].
present?
@users
=
@users
.
active
@users
=
@users
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
# Always include current user if available to filter by "Me"
@users
=
User
.
find
(
@users
.
pluck
(
:id
)
+
[
current_user
.
id
]).
uniq
if
current_user
render
json:
@users
,
only:
[
:name
,
:username
,
:id
],
methods:
[
:avatar_url
]
end
...
...
features/steps/project/forked_merge_requests.rb
View file @
b832f00d
...
...
@@ -138,10 +138,11 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step
'I should see the users from the target project ID'
do
expect
(
page
).
to
have_selector
(
'.user-result'
,
visible:
true
,
count:
2
)
expect
(
page
).
to
have_selector
(
'.user-result'
,
visible:
true
,
count:
3
)
users
=
page
.
all
(
'.user-name'
)
expect
(
users
[
0
].
text
).
to
eq
'Unassigned'
expect
(
users
[
1
].
text
).
to
eq
@project
.
users
.
first
.
name
expect
(
users
[
1
].
text
).
to
eq
current_user
.
name
expect
(
users
[
2
].
text
).
to
eq
@project
.
users
.
first
.
name
end
# Verify a link is generated against the correct project
...
...
spec/controllers/autocomplete_controller_spec.rb
View file @
b832f00d
...
...
@@ -4,6 +4,7 @@
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:user2
)
{
create
(
:user
)
}
let!
(
:non_member
)
{
create
(
:user
)
}
context
'project members'
do
before
do
...
...
@@ -61,6 +62,27 @@
end
end
context
'non-member login for public project'
do
let!
(
:project
)
{
create
(
:project
,
:public
)
}
before
do
sign_in
(
non_member
)
project
.
team
<<
[
user
,
:master
]
end
let
(
:body
)
{
JSON
.
parse
(
response
.
body
)
}
describe
'GET #users with project ID'
do
before
do
get
(
:users
,
project_id:
project
.
id
)
end
it
{
expect
(
body
).
to
be_kind_of
(
Array
)
}
it
{
expect
(
body
.
size
).
to
eq
2
}
it
{
expect
(
body
.
map
{
|
u
|
u
[
'username'
]
}).
to
match_array
([
user
.
username
,
non_member
.
username
])
}
end
end
context
'all users'
do
before
do
sign_in
(
user
)
...
...
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