summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-04-22 11:12:19 +0000
committerValery Sizov <valery@gitlab.com>2015-04-22 11:12:19 +0000
commitb9fd612922e0911d2550824fe17b8f70618e7ef8 (patch)
tree70c2b2b007169b23f27c3a44f6e689f60e10614b /lib/api
parent313c9b3caba4224f07074b929d45cc0fabcc7f54 (diff)
parente0fc2d946c2abdd165d474f55d8f8c18ea595730 (diff)
downloadgitlab-ci-b9fd612922e0911d2550824fe17b8f70618e7ef8.tar.gz
Merge branch 'project_search' into 'master'
Projects search on dashboard https://dev.gitlab.org/gitlab/gitlab-ci/issues/173 ![Screenshot_2015-04-21_16.36.58](https://gitlab.com/gitlab-org/gitlab-ci/uploads/d7b6c3d82f71fc920aa484a950ac48a2/Screenshot_2015-04-21_16.36.58.png) See merge request !73
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/projects.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 38c8c1b..bdd6f81 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -147,7 +147,7 @@ module API
# GET /projects
get do
gitlab_projects = Project.from_gitlab(
- current_user, params[:page], params[:per_page], :authorized
+ current_user, :authorized, { page: params[:page], per_page: params[:per_page] }
)
ids = gitlab_projects.map { |project| project.id }
@@ -161,7 +161,7 @@ module API
# GET /projects/owned
get "owned" do
gitlab_projects = Project.from_gitlab(
- current_user, params[:page], params[:per_page], :owned
+ current_user, :owned, { page: params[:page], per_page: params[:per_page] }
)
ids = gitlab_projects.map { |project| project.id }