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
f644cac6
Commit
f644cac6
authored
May 22, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs and failing builds
parent
fd31eeab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/filtered_search/dropdown_user.js
app/assets/javascripts/filtered_search/dropdown_user.js
+1
-1
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+1
-1
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+1
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+1
-1
No files found.
app/assets/javascripts/filtered_search/dropdown_user.js
View file @
f644cac6
...
...
@@ -45,7 +45,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
getSearchInput
()
{
const
query
=
gl
.
DropdownUtils
.
getSearchInput
(
this
.
input
);
const
{
lastToken
}
=
gl
.
FilteredSearchTokenizer
.
processTokens
(
query
,
this
.
tokenKeys
);
const
{
lastToken
}
=
gl
.
FilteredSearchTokenizer
.
processTokens
(
query
,
this
.
tokenKeys
.
get
()
);
let
value
=
lastToken
||
''
;
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
f644cac6
...
...
@@ -66,7 +66,7 @@ class FilteredSearchDropdownManager {
this
.
mapping
.
weight
=
{
reference
:
null
,
gl
:
'
DropdownNonUser
'
,
element
:
document
.
querySelector
(
'
#js-dropdown-weight
'
),
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-weight
'
),
};
}
}
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
f644cac6
...
...
@@ -453,7 +453,7 @@ class FilteredSearchManager {
this
.
saveCurrentSearchQuery
();
const
{
tokens
,
searchToken
}
=
this
.
tokenizer
.
processTokens
(
searchQuery
,
this
.
filteredSearchTokenKeys
);
=
this
.
tokenizer
.
processTokens
(
searchQuery
,
this
.
filteredSearchTokenKeys
.
get
()
);
const
currentState
=
gl
.
utils
.
getParameterByName
(
'
state
'
)
||
'
opened
'
;
paths
.
push
(
`state=
${
currentState
}
`
);
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
f644cac6
...
...
@@ -106,7 +106,7 @@
%span
.label-title.js-data-value
{{title}}
-
if
type
==
:issues
||
type
==
:boards
-
if
type
==
:issues
||
type
==
:boards
||
type
==
:boards_modal
#js-dropdown-weight
.filtered-search-input-dropdown-menu.dropdown-menu
%ul
{
'data-dropdown'
=>
true
}
%li
.filter-dropdown-item
{
'data-value'
=>
'none'
}
...
...
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