diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION index 24ba9a38de68d00674ec97b283a967699716b9f4..834f2629538327723c074ed4c3addca9888f0256 100644 --- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION +++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION @@ -1 +1 @@ -2.7.0 +2.8.0 diff --git a/ee/lib/gitlab/elastic/indexer.rb b/ee/lib/gitlab/elastic/indexer.rb index 6560fd55e2c370eba8b1a917aafe8351f1c9ad13..f63efa1ffe7a48fa840cbd9b8f2425af99ba90bc 100644 --- a/ee/lib/gitlab/elastic/indexer.rb +++ b/ee/lib/gitlab/elastic/indexer.rb @@ -73,9 +73,9 @@ module Gitlab command = if index_wiki? - [path_to_indexer, "--blob-type=wiki_blob", "--skip-commits", project.id.to_s, repository_path] + [path_to_indexer, "--blob-type=wiki_blob", "--skip-commits", "--project-path=#{project.full_path}", project.id.to_s, repository_path] else - [path_to_indexer, project.id.to_s, repository_path] + [path_to_indexer, "--project-path=#{project.full_path}", project.id.to_s, repository_path] end output, status = Gitlab::Popen.popen(command, nil, vars) diff --git a/ee/spec/lib/gitlab/elastic/indexer_spec.rb b/ee/spec/lib/gitlab/elastic/indexer_spec.rb index fae0d316245b1e5c42badf66ccb04f52721402ee..9357eab218d821f2a5d516a672683bca36e478ff 100644 --- a/ee/spec/lib/gitlab/elastic/indexer_spec.rb +++ b/ee/spec/lib/gitlab/elastic/indexer_spec.rb @@ -92,6 +92,7 @@ RSpec.describe Gitlab::Elastic::Indexer do expect_popen.with( [ TestEnv.indexer_bin_path, + "--project-path=#{project.full_path}", project.id.to_s, "#{project.repository.disk_path}.git" ], @@ -214,6 +215,7 @@ RSpec.describe Gitlab::Elastic::Indexer do TestEnv.indexer_bin_path, '--blob-type=wiki_blob', '--skip-commits', + "--project-path=#{project.full_path}", project.id.to_s, "#{project.wiki.repository.disk_path}.git" ],