diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-02 12:48:53 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-02 12:48:53 +0300 |
commit | 190a6a1e6728ff9425154fe9ccacaa75039854c7 (patch) | |
tree | 1cc67f43346c443f08e42c347f27958af3e75e2c /lib/gitlab/gitaly_client/repository_service.rb | |
parent | c1b50f858f94ee81b375ab80d1273b1e31a38307 (diff) | |
parent | 87adc799ebeb5b69f398e9a4ed37640a0d8c6c44 (diff) |
Merge branch 'jc-remove-old-code-path-search-files' into 'master'
Removing old code path for search_files_by_content
See merge request gitlab-org/gitlab-ce!25617
Diffstat (limited to 'lib/gitlab/gitaly_client/repository_service.rb')
-rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index a7e20d9429e..a08bfd0e25b 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -324,8 +324,8 @@ module Gitlab GitalyClient.call(@storage, :repository_service, :search_files_by_name, request, timeout: GitalyClient.fast_timeout).flat_map(&:files) end - def search_files_by_content(ref, query, chunked_response: true) - request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query, chunked_response: chunked_response) + def search_files_by_content(ref, query) + request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query) response = GitalyClient.call(@storage, :repository_service, :search_files_by_content, request) search_results_from_response(response) @@ -340,18 +340,11 @@ module Gitlab gitaly_response.each do |message| next if message.nil? - # Old client will ignore :chunked_response flag - # and return messages with `matches` key. - # This code path will be removed post 12.0 release - if message.matches.any? - matches += message.matches - else - current_match << message.match_data - - if message.end_of_match - matches << current_match - current_match = +"" - end + current_match << message.match_data + + if message.end_of_match + matches << current_match + current_match = +"" end end |