diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 10:36:04 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 10:36:04 +0300 |
commit | e7cf10e4468823fc6cf12a280a3d7a7e009e045d (patch) | |
tree | cb53079f70a9ced67b45f110e706ff24c1f97652 /app/services/search | |
parent | d7eb6e5515b49474b10109779abd67d92d1b6b22 (diff) | |
parent | 15e0ab498dc9f680dc6995c46a8ba7b76fc1f081 (diff) | |
download | gitlab-ce-e7cf10e4468823fc6cf12a280a3d7a7e009e045d.tar.gz |
Merge pull request #5531 from NotSqrt/add-search
Add ability to search in issue description and issue comments
Diffstat (limited to 'app/services/search')
-rw-r--r-- | app/services/search/global_service.rb | 1 | ||||
-rw-r--r-- | app/services/search/project_service.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index 21214511182..d213e1375e0 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -28,6 +28,7 @@ module Search projects: [], merge_requests: [], issues: [], + notes: [], total_results: 0, } end diff --git a/app/services/search/project_service.rb b/app/services/search/project_service.rb index 3ebaafc752c..493dee95f90 100644 --- a/app/services/search/project_service.rb +++ b/app/services/search/project_service.rb @@ -18,8 +18,9 @@ module Search result[:total_results] = blobs.total_count else result[:merge_requests] = project.merge_requests.search(query).order('updated_at DESC').limit(20) - result[:issues] = project.issues.search(query).order('updated_at DESC').limit(20) - result[:total_results] = %w(issues merge_requests).sum { |items| result[items.to_sym].size } + result[:issues] = project.issues.where("title like :query OR description like :query ", query: "%#{query}%").order('updated_at DESC').limit(20) + result[:notes] = Note.where(noteable_type: 'issue').where(project_id: project.id).where("note like :query", query: "%#{query}%").order('updated_at DESC').limit(20) + result[:total_results] = %w(issues merge_requests notes).sum { |items| result[items.to_sym].size } end result @@ -30,6 +31,7 @@ module Search merge_requests: [], issues: [], blobs: [], + notes: [], total_results: 0, } end |