summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-12 08:45:54 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-02-12 08:45:54 +0000
commita1503cae82907f38a63b39731c60915e9c990bf5 (patch)
tree91e6686c687c5912d605eb09e9a08f50dc144e3d /lib/api
parent498ade4801a822f8704390b10d178af9fe7987cb (diff)
parent68ff219c4ec9088005ab872e141912f35ecc59f3 (diff)
downloadgitlab-ce-a1503cae82907f38a63b39731c60915e9c990bf5.tar.gz
Merge branch '42937-search-api-fix' into 'master'
API - fix searching in group/project specified by path Closes #42937 See merge request gitlab-org/gitlab-ce!17033
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/search.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/search.rb b/lib/api/search.rb
index 9f08fd96a3b..b9982e03bb3 100644
--- a/lib/api/search.rb
+++ b/lib/api/search.rb
@@ -85,9 +85,9 @@ module API
use :pagination
end
get ':id/-/search' do
- find_group!(params[:id])
+ group = find_group!(params[:id])
- present search(group_id: params[:id]), with: entity
+ present search(group_id: group.id), with: entity
end
end
@@ -106,9 +106,9 @@ module API
use :pagination
end
get ':id/-/search' do
- find_project!(params[:id])
+ project = find_project!(params[:id])
- present search(project_id: params[:id]), with: entity
+ present search(project_id: project.id), with: entity
end
end
end