diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-01-13 10:23:27 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-01-16 11:55:11 -0500 |
| commit | 6c1190623fb4d69786efb955b3af0b9241974776 (patch) | |
| tree | ac35ae7fe5a9398b3eb052d9ac1846226e6d28fa | |
| parent | 0ff88ac56281db18afa37981530d97da0ea8e38a (diff) | |
| download | gitlab-ce-6c1190623fb4d69786efb955b3af0b9241974776.tar.gz | |
Fix group/project filters on search page
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/search.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e2d7f94e571..ceeffa8e6d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/search.js index 4b6ebadeac7..5945cab4cf0 100644 --- a/app/assets/javascripts/search.js +++ b/app/assets/javascripts/search.js @@ -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({ |