kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix group/project filters on search page

Browse source
This commit is contained in:
Eric Eastwood 2017-01-13 10:23:27 -05:00
parent 0ff88ac562
commit 6c1190623f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -892,7 +892,7 @@ DEPENDENCIES
gemojione (~> 3.0)
github-linguist (~> 4.7.0)
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_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)

6
app/assets/javascripts/search.js
View file

@ -12,6 +12,9 @@
selectable: true,
filterable: true,
fieldName: 'group_id',
search: {
fields: ['name']
},
data: function(term, callback) {
return Api.groups(term, {}, function(data) {
data.unshift({
@ -40,6 +43,9 @@
selectable: true,
filterable: true,
fieldName: 'project_id',
search: {
fields: ['name']
},
data: function(term, callback) {
return Api.projects(term, 'id', function(data) {
data.unshift({