summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/api/projects.md4
-rw-r--r--lib/api/projects.rb10
2 files changed, 6 insertions, 8 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 380f6f21ce8..5150331e7d7 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -497,5 +497,5 @@ GET /projects/search/:query
Parameters:
+ query (required) - A string contained in the project name
-+ per_page (optional) - number of projects to return per page, defaults to 20
-+ offset (optional) - the offset in pages to retrieve
++ per_page (optional) - number of projects to return per page
++ page (optional) - the page to retrieve
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index d17b791dccc..cf357b23c40 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -266,16 +266,14 @@ module API
#
# Parameters:
# query (required) - A string contained in the project name
- # per_page (optional) - number of projects to return per page, defaults to 20
- # offset (optional) - the offset in pages to retrieve
+ # per_page (optional) - number of projects to return per page
+ # page (optional) - the page to retrieve
# Example Request:
# GET /projects/search/:query
get "/search/:query" do
- limit = (params[:per_page] || 20).to_i
- offset = (params[:page] || 0).to_i * limit
ids = current_user.authorized_projects.map(&:id)
- projects = Project.where("(id in (?) OR public = true) AND (name LIKE (?))", ids, "%#{params[:query]}%").limit(limit).offset(offset)
- present projects, with: Entities::Project
+ projects = Project.where("(id in (?) OR public = true) AND (name LIKE (?))", ids, "%#{params[:query]}%")
+ present paginate(projects), with: Entities::Project
end
end
end