Commit bae06faf authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-bulk-indexer-es7-compatibility' into 'master'

BulkIndexer change _routing -> routing to support ES 7

See merge request gitlab-org/gitlab!26639
parents c62a2fc7 b4a0969e
---
title: BulkIndexer change _routing -> routing to support ES 7
merge_request: 26639
author:
type: fixed
...@@ -76,7 +76,7 @@ module Gitlab ...@@ -76,7 +76,7 @@ module Gitlab
_id: ref.es_id _id: ref.es_id
} }
op[:_routing] = ref.es_parent if ref.es_parent # blank for projects op[:routing] = ref.es_parent if ref.es_parent # blank for projects
op op
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment