diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 00:04:14 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 00:04:14 +0300 |
commit | 9e5bc432630d04867cea9f38383d1a4fc49b62cd (patch) | |
tree | da034321f5e8be78c1a3efeefd7f1974743a22a0 /lib/gitlab/project_search_results.rb | |
parent | 5d9a5c02d83c2aa9fed66c045eb88762679fb60e (diff) | |
download | gitlab-ce-9e5bc432630d04867cea9f38383d1a4fc49b62cd.tar.gz |
Pass scope and page to Gitlab::SearchResults#objects instead of initialize
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/gitlab/project_search_results.rb')
-rw-r--r-- | lib/gitlab/project_search_results.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index b0a0bee1c81..71b8f4f452e 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -2,19 +2,13 @@ module Gitlab class ProjectSearchResults < SearchResults attr_reader :project, :repository_ref - def initialize(project_id, query, scope = nil, page = nil, repository_ref = nil) + def initialize(project_id, query, repository_ref = nil) @project = Project.find(project_id) @repository_ref = repository_ref - @page = page @query = Shellwords.shellescape(query) if query.present? - @scope = scope - - unless %w(blobs notes issues merge_requests).include?(@scope) - @scope = default_scope - end end - def objects + def objects(scope, page) case scope when 'notes' notes.page(page).per(per_page) @@ -51,10 +45,6 @@ module Gitlab Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC') end - def default_scope - 'blobs' - end - def limit_project_ids [project.id] end |