Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNotSqrt <notsqrt@gmail.com>2014-05-15 21:54:19 +0400
committerNotSqrt <notsqrt@gmail.com>2014-05-15 21:54:19 +0400
commit15e0ab498dc9f680dc6995c46a8ba7b76fc1f081 (patch)
tree70789affc23a2be89959eb9dec423c3d5affe858 /app/services/search
parent41ca07e6cb384a38dc629738ee4a7bf422e4e13a (diff)
Update ability to search in issue descriptions and comments
Diffstat (limited to 'app/services/search')
-rw-r--r--app/services/search/global_service.rb1
-rw-r--r--app/services/search/project_service.rb6
2 files changed, 5 insertions, 2 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index 8a1fce17ce7..d4fb3598bf5 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