Commit 8285029d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'elastic_indexer' into 'master'

Elastic indexer performance improvements

https://gitlab.com/gitlab-org/gitlab-ee/issues/220

See merge request !140
parents 2372ccd4 d89a72f4
v 8.5.0 (unreleased) v 8.5.0 (unreleased)
v 8.4.2
- Elasticsearch indexer performance improvements
v 8.4.1 v 8.4.1
- No EE-specific changes - No EE-specific changes
......
...@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5' ...@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
# Search # Search
gem 'elasticsearch-model' gem 'elasticsearch-model'
gem 'elasticsearch-rails' gem 'elasticsearch-rails'
gem 'gitlab-elasticsearch-git', require: "elasticsearch/git" gem 'gitlab-elasticsearch-git', '~> 0.0.9', require: "elasticsearch/git"
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0' gem 'html-pipeline', '~> 1.11.0'
......
...@@ -358,13 +358,13 @@ GEM ...@@ -358,13 +358,13 @@ GEM
mime-types (>= 1.19) mime-types (>= 1.19)
rugged (>= 0.23.0b) rugged (>= 0.23.0b)
github-markup (1.3.3) github-markup (1.3.3)
gitlab-elasticsearch-git (0.0.7) gitlab-elasticsearch-git (0.0.9)
activemodel (~> 4.2.0) activemodel (~> 4.2)
activesupport (~> 4.2.0) activesupport (~> 4.2)
charlock_holmes (~> 0.7.3) charlock_holmes (~> 0.7)
elasticsearch-api (~> 1.0.15) elasticsearch-api (~> 1.0)
elasticsearch-model elasticsearch-model (~> 0.1.8)
github-linguist (~> 4.7.0) github-linguist (~> 4.7)
rugged (~> 0.23.3) rugged (~> 0.23.3)
gitlab-flowdock-git-hook (1.0.1) gitlab-flowdock-git-hook (1.0.1)
flowdock (~> 0.7) flowdock (~> 0.7)
...@@ -958,7 +958,7 @@ DEPENDENCIES ...@@ -958,7 +958,7 @@ DEPENDENCIES
gemnasium-gitlab-service (~> 0.2) gemnasium-gitlab-service (~> 0.2)
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
github-markup (~> 1.3.1) github-markup (~> 1.3.1)
gitlab-elasticsearch-git gitlab-elasticsearch-git (~> 0.0.9)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-license (~> 0.0.4) gitlab-license (~> 0.0.4)
gitlab_emoji (~> 0.2.0) gitlab_emoji (~> 0.2.0)
......
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