Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8a93590e
Commit
8a93590e
authored
Nov 20, 2020
by
Changzheng Liu
Committed by
Bob Van Landuyt
Nov 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass project full path to indexer
parent
7fb417cf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
GITLAB_ELASTICSEARCH_INDEXER_VERSION
GITLAB_ELASTICSEARCH_INDEXER_VERSION
+1
-1
ee/lib/gitlab/elastic/indexer.rb
ee/lib/gitlab/elastic/indexer.rb
+2
-2
ee/spec/lib/gitlab/elastic/indexer_spec.rb
ee/spec/lib/gitlab/elastic/indexer_spec.rb
+2
-0
No files found.
GITLAB_ELASTICSEARCH_INDEXER_VERSION
View file @
8a93590e
2.
7
.0
2.
8
.0
ee/lib/gitlab/elastic/indexer.rb
View file @
8a93590e
...
...
@@ -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
)
...
...
ee/spec/lib/gitlab/elastic/indexer_spec.rb
View file @
8a93590e
...
...
@@ -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"
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment