diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-14 11:50:47 +0000 |
| commit | f3af06526ad64e653183e4ffd0ea3bbdef5b1bda (patch) | |
| tree | 20150d7ccea6d7fc61fed983e478e965bf0da332 /lib/api/entities.rb | |
| parent | ed6fd101ffe1230c9f4110950e5de2b8800ce9ba (diff) | |
| download | gitlab-ce-f3af06526ad64e653183e4ffd0ea3bbdef5b1bda.tar.gz | |
Merge branch '42934-search-api-fix' into 'master'10-5-stable-prepare-rc6
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.rb | 2 |
1 files changed, 2 insertions, 0 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 |