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
6c119062
Commit
6c119062
authored
Jan 13, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group/project filters on search page
parent
0ff88ac5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
Gemfile.lock
Gemfile.lock
+1
-1
app/assets/javascripts/search.js
app/assets/javascripts/search.js
+6
-0
No files found.
Gemfile.lock
View file @
6c119062
...
@@ -892,7 +892,7 @@ DEPENDENCIES
...
@@ -892,7 +892,7 @@ DEPENDENCIES
gemojione (~> 3.0)
gemojione (~> 3.0)
github-linguist (~> 4.7.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.
1
)
gitlab-markup (~> 1.5.
0
)
gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
gitlab_omniauth-ldap (~> 1.2.1)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)
gollum-lib (~> 4.2)
...
...
app/assets/javascripts/search.js
View file @
6c119062
...
@@ -12,6 +12,9 @@
...
@@ -12,6 +12,9 @@
selectable
:
true
,
selectable
:
true
,
filterable
:
true
,
filterable
:
true
,
fieldName
:
'
group_id
'
,
fieldName
:
'
group_id
'
,
search
:
{
fields
:
[
'
name
'
]
},
data
:
function
(
term
,
callback
)
{
data
:
function
(
term
,
callback
)
{
return
Api
.
groups
(
term
,
{},
function
(
data
)
{
return
Api
.
groups
(
term
,
{},
function
(
data
)
{
data
.
unshift
({
data
.
unshift
({
...
@@ -40,6 +43,9 @@
...
@@ -40,6 +43,9 @@
selectable
:
true
,
selectable
:
true
,
filterable
:
true
,
filterable
:
true
,
fieldName
:
'
project_id
'
,
fieldName
:
'
project_id
'
,
search
:
{
fields
:
[
'
name
'
]
},
data
:
function
(
term
,
callback
)
{
data
:
function
(
term
,
callback
)
{
return
Api
.
projects
(
term
,
'
id
'
,
function
(
data
)
{
return
Api
.
projects
(
term
,
'
id
'
,
function
(
data
)
{
data
.
unshift
({
data
.
unshift
({
...
...
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