diff options
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 21 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 10 |
3 files changed, 8 insertions, 25 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 3500250a4b0..bfbadb3a2ac 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.21.0 +1.23.0
\ No newline at end of file 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 diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index e3dd02f1478..7e6dfa30e37 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -619,16 +619,6 @@ describe Gitlab::Git::Repository, :seed_helper do repository.search_files_by_content('search-files-by-content', 'search-files-by-content-branch') end end - - it_should_behave_like 'search files by content' do - let(:search_results) do - repository.gitaly_repository_client.search_files_by_content( - 'search-files-by-content-branch', - 'search-files-by-content', - chunked_response: false - ) - end - end end describe '#find_remote_root_ref' do |