diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
| commit | edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f (patch) | |
| tree | 9efee3a24520ea5285cb8ceaf92b0f869ed6c6a6 /lib/api/search.rb | |
| parent | c503429e5e8538649bec02d74963ec0eb8f0cb98 (diff) | |
| parent | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (diff) | |
| download | gitlab-ce-edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f.tar.gz | |
Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/search.rb')
| -rw-r--r-- | lib/api/search.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/api/search.rb b/lib/api/search.rb index 5d9ec617cb7..37fbabe419c 100644 --- a/lib/api/search.rb +++ b/lib/api/search.rb @@ -34,9 +34,7 @@ module API def process_results(results) case params[:scope] - when 'wiki_blobs' - paginate(results).map { |blob| Gitlab::ProjectSearchResults.parse_search_result(blob, user_project) } - when 'blobs' + when 'blobs', 'wiki_blobs' paginate(results).map { |blob| blob[1] } else paginate(results) |