deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1720 from coagulant/wiki_search

Browse source 
Wiki search
This commit is contained in:
Dmitriy Zaporozhets 2012-11-07 03:51:20 -08:00
commit 8114d36caf
6 changed files with 50 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/contexts/search_context.rb
View file

@ -13,6 +13,7 @@ class SearchContext
result[:projects] = Project.where(id: project_ids).search(query).limit(10)
result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
result[:wiki_pages] = Wiki.where(project_id: project_ids).search(query).limit(10)
result
end
@ -20,7 +21,8 @@ class SearchContext
@result ||= {
projects: [],
merge_requests: [],
issues: []
issues: [],
wiki_pages: []
}
end
end