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
Boxiang Sun
gitlab-ce
Commits
af178560
Commit
af178560
authored
Mar 07, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code improvements
parent
f44fb5cf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/filtered_search/dropdown_utils.js
app/assets/javascripts/filtered_search/dropdown_utils.js
+1
-0
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+2
-2
spec/features/merge_requests/filter_by_labels_spec.rb
spec/features/merge_requests/filter_by_labels_spec.rb
+1
-1
No files found.
app/assets/javascripts/filtered_search/dropdown_utils.js
View file @
af178560
...
@@ -79,6 +79,7 @@
...
@@ -79,6 +79,7 @@
return
dataValue
!==
null
;
return
dataValue
!==
null
;
}
}
// Determines the full search query (visual tokens + input)
static
getSearchQuery
()
{
static
getSearchQuery
()
{
const
tokensContainer
=
document
.
querySelector
(
'
.tokens-container
'
);
const
tokensContainer
=
document
.
querySelector
(
'
.tokens-container
'
);
const
values
=
[];
const
values
=
[];
...
...
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @
af178560
...
@@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do
...
@@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do
end
end
context
'author with other filters'
do
context
'author with other filters'
do
search_term
=
'issue'
let
(
:search_term
)
{
'issue'
}
it
'filters issues by searched author and text'
do
it
'filters issues by searched author and text'
do
input_filtered_search
(
"author:@
#{
user
.
username
}
#{
search_term
}
"
)
input_filtered_search
(
"author:@
#{
user
.
username
}
#{
search_term
}
"
)
...
@@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do
...
@@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do
end
end
context
'milestone with other filters'
do
context
'milestone with other filters'
do
search_term
=
'bug'
let
(
:search_term
)
{
'bug'
}
it
'filters issues by searched milestone and text'
do
it
'filters issues by searched milestone and text'
do
input_filtered_search
(
"milestone:%
#{
milestone
.
title
}
#{
search_term
}
"
)
input_filtered_search
(
"milestone:%
#{
milestone
.
title
}
#{
search_term
}
"
)
...
...
spec/features/merge_requests/filter_by_labels_spec.rb
View file @
af178560
...
@@ -70,7 +70,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do
...
@@ -70,7 +70,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do
context
'filter by label enhancement and bug in issues list'
do
context
'filter by label enhancement and bug in issues list'
do
before
do
before
do
input_filtered_search
(
'label:~bug label:~enhancement
'
)
input_filtered_search
(
'label:~bug label:~enhancement'
)
end
end
it
'applies the filters'
do
it
'applies the filters'
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