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
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-12 11:45:54 +0300
committerIan Baum <ibaum@gitlab.com>2018-02-12 20:20:21 +0300
commit3d40deb1b01cd856b3e7ab7b00fa0f3a6af0de58 (patch)
tree2777341fd89b650730201c1948da092558d5ea4a /lib
parent676602a98ebf7817cefd1ba0e925530efc91d005 (diff)
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')
-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