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
721c7cd1
Commit
721c7cd1
authored
Dec 14, 2020
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes reviewers filter being visible on issues page
parent
df79193d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
9 deletions
+20
-9
app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js
...ts/filtered_search/add_extra_tokens_for_merge_requests.js
+12
-0
app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
...ts/filtered_search/issuable_filtered_search_token_keys.js
+0
-9
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+8
-0
No files found.
app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js
View file @
721c7cd1
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
(
IssuableTokenKeys
,
disableTargetBranchFilter
=
false
)
=>
{
export
default
(
IssuableTokenKeys
,
disableTargetBranchFilter
=
false
)
=>
{
const
reviewerToken
=
{
formattedKey
:
__
(
'
Reviewer
'
),
key
:
'
reviewer
'
,
type
:
'
string
'
,
param
:
'
username
'
,
symbol
:
'
@
'
,
icon
:
'
user
'
,
tag
:
'
@reviewer
'
,
};
IssuableTokenKeys
.
tokenKeys
.
splice
(
2
,
0
,
reviewerToken
);
IssuableTokenKeys
.
tokenKeysWithAlternative
.
splice
(
2
,
0
,
reviewerToken
);
const
draftToken
=
{
const
draftToken
=
{
token
:
{
token
:
{
formattedKey
:
__
(
'
Draft
'
),
formattedKey
:
__
(
'
Draft
'
),
...
...
app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
View file @
721c7cd1
...
@@ -21,15 +21,6 @@ export const tokenKeys = [
...
@@ -21,15 +21,6 @@ export const tokenKeys = [
icon
:
'
user
'
,
icon
:
'
user
'
,
tag
:
'
@assignee
'
,
tag
:
'
@assignee
'
,
},
},
{
formattedKey
:
__
(
'
Reviewer
'
),
key
:
'
reviewer
'
,
type
:
'
string
'
,
param
:
'
username
'
,
symbol
:
'
@
'
,
icon
:
'
user
'
,
tag
:
'
@reviewer
'
,
},
{
{
formattedKey
:
__
(
'
Milestone
'
),
formattedKey
:
__
(
'
Milestone
'
),
key
:
'
milestone
'
,
key
:
'
milestone
'
,
...
...
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @
721c7cd1
...
@@ -153,6 +153,14 @@ RSpec.describe 'Filter issues', :js do
...
@@ -153,6 +153,14 @@ RSpec.describe 'Filter issues', :js do
end
end
end
end
describe
'filter by reviewer'
do
it
'does not allow filtering by reviewer'
do
find
(
'.filtered-search'
).
click
expect
(
page
).
to_not
have_button
(
'Reviewer'
)
end
end
describe
'filter issues by label'
do
describe
'filter issues by label'
do
context
'only label'
do
context
'only label'
do
it
'filters issues by searched label'
do
it
'filters issues by searched label'
do
...
...
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