summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-02-14 10:15:49 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-02-14 10:15:49 +0000
commit5e829934f95bcae25f5c09583b6febe6e2e646b6 (patch)
tree48b65e3a3125f23594d9d7bdf728f71aa7e224d5 /lib/api/entities.rb
parente7595c10bc14cd32c456b9c6a94e227d41d6d09a (diff)
parentb0b4ae1875529cd7ca786bd5eccd49be9a40a038 (diff)
downloadgitlab-ce-5e829934f95bcae25f5c09583b6febe6e2e646b6.tar.gz
Merge branch '42934-search-api-fix' into 'master'
Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c8cda85b170..e9e32ac76fe 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 BasicRef < Grape::Entity
@@ -1176,6 +1177,7 @@ module API
expose :id
expose :ref
expose :startline
+ expose :project_id
end
end
end