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
2ef7c83a
Commit
2ef7c83a
authored
Nov 28, 2019
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use merge instead of dup
parent
072224a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
ee/lib/gitlab/elastic/indexer.rb
ee/lib/gitlab/elastic/indexer.rb
+3
-3
ee/spec/lib/gitlab/elastic/indexer_spec.rb
ee/spec/lib/gitlab/elastic/indexer_spec.rb
+1
-2
No files found.
ee/lib/gitlab/elastic/indexer.rb
View file @
2ef7c83a
...
@@ -106,9 +106,9 @@ module Gitlab
...
@@ -106,9 +106,9 @@ module Gitlab
end
end
def
elasticsearch_config
(
target
)
def
elasticsearch_config
(
target
)
config
=
Gitlab
::
CurrentSettings
.
elasticsearch_config
.
dup
Gitlab
::
CurrentSettings
.
elasticsearch_config
.
merge
(
config
[
:index_name
]
=
target
.
index_name
index_name:
target
.
index_name
config
.
to_json
)
.
to_json
end
end
def
gitaly_connection_info
def
gitaly_connection_info
...
...
ee/spec/lib/gitlab/elastic/indexer_spec.rb
View file @
2ef7c83a
...
@@ -282,8 +282,7 @@ describe Gitlab::Elastic::Indexer do
...
@@ -282,8 +282,7 @@ describe Gitlab::Elastic::Indexer do
end
end
def
elasticsearch_config
def
elasticsearch_config
config
=
Gitlab
::
CurrentSettings
.
elasticsearch_config
.
dup
Gitlab
::
CurrentSettings
.
elasticsearch_config
.
merge
(
config
.
merge!
(
index_name:
'gitlab-test'
index_name:
'gitlab-test'
)
)
end
end
...
...
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