API - Include project in commits&blobs search results42934-search-api-fix

2 files changed, 6 insertions, 8 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 7838de13c56..1608af97d38 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -274,6 +274,7 @@ module API
       expose :stats, using: Entities::CommitStats, if: :stats
       expose :status
       expose :last_pipeline, using: 'API::Entities::PipelineBasic'
+      expose :project_id
     end
 
     class Branch < Grape::Entity
@@ -1172,6 +1173,7 @@ module API
       expose :id
       expose :ref
       expose :startline
+      expose :project_id
     end
   end
 end
diff --git a/lib/api/search.rb b/lib/api/search.rb
index b9982e03bb3..3556ad98c52 100644
--- a/lib/api/search.rb
+++ b/lib/api/search.rb
@@ -11,7 +11,7 @@ module API
         projects: Entities::BasicProjectDetails,
         milestones: Entities::Milestone,
         notes: Entities::Note,
-        commits: Entities::Commit,
+        commits: Entities::CommitDetail,
         blobs: Entities::Blob,
         wiki_blobs: Entities::Blob,
         snippet_titles: Entities::Snippet,
@@ -35,7 +35,7 @@ module API
       def process_results(results)
         case params[:scope]
         when 'wiki_blobs'
-          paginate(results).map { |blob| Gitlab::ProjectSearchResults.parse_search_result(blob) }
+          paginate(results).map { |blob| Gitlab::ProjectSearchResults.parse_search_result(blob, user_project) }
         when 'blobs'
           paginate(results).map { |blob| blob[1] }
         else
@@ -85,9 +85,7 @@ module API
         use :pagination
       end
       get ':id/-/search' do
-        group = find_group!(params[:id])
-
-        present search(group_id: group.id), with: entity
+        present search(group_id: user_group.id), with: entity
       end
     end
 
@@ -106,9 +104,7 @@ module API
         use :pagination
       end
       get ':id/-/search' do
-        project = find_project!(params[:id])
-
-        present search(project_id: project.id), with: entity
+        present search(project_id: user_project.id), with: entity
       end
     end
   end