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
6061e94c
Commit
6061e94c
authored
Nov 17, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
b80ed618
a1b840eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
2 deletions
+45
-2
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+7
-1
changelogs/unreleased/assignee-dropdown-autocomplete.yml
changelogs/unreleased/assignee-dropdown-autocomplete.yml
+4
-0
spec/features/issues/issue_sidebar_spec.rb
spec/features/issues/issue_sidebar_spec.rb
+34
-1
No files found.
app/controllers/autocomplete_controller.rb
View file @
6061e94c
...
@@ -55,7 +55,13 @@ class AutocompleteController < ApplicationController
...
@@ -55,7 +55,13 @@ class AutocompleteController < ApplicationController
def
find_users
def
find_users
@users
=
@users
=
if
@project
if
@project
@project
.
team
.
users
user_ids
=
@project
.
team
.
users
.
map
(
&
:id
)
if
params
[
:author_id
].
present?
user_ids
<<
params
[
:author_id
]
end
User
.
where
(
id:
user_ids
)
elsif
params
[
:group_id
].
present?
elsif
params
[
:group_id
].
present?
group
=
Group
.
find
(
params
[
:group_id
])
group
=
Group
.
find
(
params
[
:group_id
])
return
render_404
unless
can?
(
current_user
,
:read_group
,
group
)
return
render_404
unless
can?
(
current_user
,
:read_group
,
group
)
...
...
changelogs/unreleased/assignee-dropdown-autocomplete.yml
0 → 100644
View file @
6061e94c
---
title
:
Assignee dropdown now searches author of issue or merge request
merge_request
:
author
:
spec/features/issues/issue_sidebar_spec.rb
View file @
6061e94c
require
'rails_helper'
require
'rails_helper'
feature
'Issue Sidebar'
,
feature:
true
do
feature
'Issue Sidebar'
,
feature:
true
do
let
(
:project
)
{
create
(
:project
)
}
include
WaitForAjax
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let!
(
:user
)
{
create
(
:user
)}
let!
(
:user
)
{
create
(
:user
)}
...
@@ -10,6 +12,37 @@ feature 'Issue Sidebar', feature: true do
...
@@ -10,6 +12,37 @@ feature 'Issue Sidebar', feature: true do
login_as
(
user
)
login_as
(
user
)
end
end
context
'assignee'
,
js:
true
do
let
(
:user2
)
{
create
(
:user
)
}
let
(
:issue2
)
{
create
(
:issue
,
project:
project
,
author:
user2
)
}
before
do
project
.
team
<<
[
user
,
:developer
]
visit_issue
(
project
,
issue2
)
find
(
'.block.assignee .edit-link'
).
click
wait_for_ajax
end
it
'shows author in assignee dropdown'
do
page
.
within
'.dropdown-menu-user'
do
expect
(
page
).
to
have_content
(
user2
.
name
)
end
end
it
'shows author when filtering assignee dropdown'
do
page
.
within
'.dropdown-menu-user'
do
find
(
'.dropdown-input-field'
).
native
.
send_keys
user2
.
name
sleep
1
# Required to wait for end of input delay
wait_for_ajax
expect
(
page
).
to
have_content
(
user2
.
name
)
end
end
end
context
'as a allowed user'
do
context
'as a allowed user'
do
before
do
before
do
project
.
team
<<
[
user
,
:developer
]
project
.
team
<<
[
user
,
:developer
]
...
...
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