Merge branch 'blob-count2' into 'master'

Support unlimited file search in web UI and API

See merge request gitlab-org/gitlab-ce!23553

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/api/search.md b/doc/api/search.md
index 9716f682ace..a9369930003 100644
--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -722,6 +722,17 @@ Example response:
 
 ### Scope: wiki_blobs
 
+Wiki blobs searches are performed on both filenames and contents. Search
+results:
+
+- Found in filenames are displayed before results found in contents.
+- May contain multiple matches for the same blob because the search string
+  might be found in both the filename and content, and matches of the different
+types are displayed separately.
+- May contain multiple matches for the same blob because the search string
+  might be found if the search string appears multiple times in the content.
+
+
 ```bash
 curl --request GET --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/6/search?scope=wiki_blobs&search=bye
 ```
@@ -783,6 +794,15 @@ Filters are available for this scope:
 
 to use a filter simply include it in your query like so: `a query filename:some_name*`.
 
+Blobs searches are performed on both filenames and contents. Search results:
+
+- Found in filenames are displayed before results found in contents.
+- May contain multiple matches for the same blob because the search string
+  might be found in both the filename and content, and matches of the different
+types are displayed separately.
+- May contain multiple matches for the same blob because the search string
+  might be found if the search string appears multiple times in the content.
+
 You may use wildcards (`*`) to use glob matching.
 
 ```bash