BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
bd1d7781
Commit
bd1d7781
authored
Mar 08, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'filtered-search-visual-tokens-improvements' into 'master'
Filtered Search Visual Tokens code improvements See merge request !9781
parents
cb19fd14
af178560
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
dropdown_utils.js
app/assets/javascripts/filtered_search/dropdown_utils.js
+1
-0
filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+2
-2
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 @
bd1d7781
...
...
@@ -79,6 +79,7 @@
return
dataValue
!==
null
;
}
// Determines the full search query (visual tokens + input)
static
getSearchQuery
()
{
const
tokensContainer
=
document
.
querySelector
(
'.tokens-container'
);
const
values
=
[];
...
...
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @
bd1d7781
...
...
@@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do
end
context
'author with other filters'
do
search_term
=
'issue'
let
(
:search_term
)
{
'issue'
}
it
'filters issues by searched author and text'
do
input_filtered_search
(
"author:@
#{
user
.
username
}
#{
search_term
}
"
)
...
...
@@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do
end
context
'milestone with other filters'
do
search_term
=
'bug'
let
(
:search_term
)
{
'bug'
}
it
'filters issues by searched milestone and text'
do
input_filtered_search
(
"milestone:%
#{
milestone
.
title
}
#{
search_term
}
"
)
...
...
spec/features/merge_requests/filter_by_labels_spec.rb
View file @
bd1d7781
...
...
@@ -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
before
do
input_filtered_search
(
'label:~bug label:~enhancement
'
)
input_filtered_search
(
'label:~bug label:~enhancement'
)
end
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