diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
| commit | 5e829934f95bcae25f5c09583b6febe6e2e646b6 (patch) | |
| tree | 48b65e3a3125f23594d9d7bdf728f71aa7e224d5 /doc | |
| parent | e7595c10bc14cd32c456b9c6a94e227d41d6d09a (diff) | |
| parent | b0b4ae1875529cd7ca786bd5eccd49be9a40a038 (diff) | |
| download | gitlab-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 'doc')
| -rw-r--r-- | doc/api/README.md | 1 | ||||
| -rw-r--r-- | doc/api/search.md | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index f226716c3b5..88710eae4fe 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -49,6 +49,7 @@ following locations: - [Repositories](repositories.md) - [Repository Files](repository_files.md) - [Runners](runners.md) +- [Search](search.md) - [Services](services.md) - [Settings](settings.md) - [Sidekiq metrics](sidekiq_metrics.md) diff --git a/doc/api/search.md b/doc/api/search.md index 1fba9c3fbb8..d441b556186 100644 --- a/doc/api/search.md +++ b/doc/api/search.md @@ -737,7 +737,8 @@ Example response: "filename": "home.md", "id": null, "ref": "master", - "startline": 5 + "startline": 5, + "project_id": 6 } ] ``` @@ -767,7 +768,8 @@ Example response: "authored_date": "2013-02-18T22:02:54.000Z", "committer_name": "angus croll", "committer_email": "anguscroll@gmail.com", - "committed_date": "2013-02-18T22:02:54.000Z" + "committed_date": "2013-02-18T22:02:54.000Z", + "project_id": 6 } ] ``` @@ -789,7 +791,8 @@ Example response: "filename": "README.md", "id": null, "ref": "master", - "startline": 46 + "startline": 46, + "project_id": 6 } ] ``` |