diff --git a/Gemfile b/Gemfile index 1b4c06fb5259db2ef10405bd5c065096ec3ae806..100c6a2e14e4a5739a9e22baf52d3ef0f6438505 100644 --- a/Gemfile +++ b/Gemfile @@ -104,9 +104,9 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.5' # Search -gem 'elasticsearch-model' -gem 'elasticsearch-rails' -gem 'gitlab-elasticsearch-git', '~> 1.0.1', require: "elasticsearch/git" +gem 'elasticsearch-model', '~> 0.1.9' +gem 'elasticsearch-rails', '~> 0.1.9' +gem 'gitlab-elasticsearch-git', '~> 1.1', require: "elasticsearch/git" # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' diff --git a/Gemfile.lock b/Gemfile.lock index 3a094d8866ee065e85c8864c4abd4d23b6555cd0..a9f05b1b38743ca0eb6538a70abeed66fd0d1821 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,17 +169,17 @@ GEM railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) - elasticsearch (1.0.15) - elasticsearch-api (= 1.0.15) - elasticsearch-transport (= 1.0.15) - elasticsearch-api (1.0.15) + elasticsearch (1.1.0) + elasticsearch-api (= 1.1.0) + elasticsearch-transport (= 1.1.0) + elasticsearch-api (1.1.0) multi_json - elasticsearch-model (0.1.8) + elasticsearch-model (0.1.9) activesupport (> 3) elasticsearch (> 0.4) hashie - elasticsearch-rails (0.1.8) - elasticsearch-transport (1.0.15) + elasticsearch-rails (0.1.9) + elasticsearch-transport (1.1.0) faraday multi_json email_reply_trimmer (0.1.6) @@ -265,7 +265,7 @@ GEM mime-types (>= 1.19) rugged (>= 0.23.0b) github-markup (1.4.0) - gitlab-elasticsearch-git (1.0.1) + gitlab-elasticsearch-git (1.1.0) activemodel (~> 4.2) activesupport (~> 4.2) charlock_holmes (~> 0.7) @@ -889,8 +889,8 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) - elasticsearch-model - elasticsearch-rails + elasticsearch-model (~> 0.1.9) + elasticsearch-rails (~> 0.1.9) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) factory_girl_rails (~> 4.7.0) @@ -908,7 +908,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - gitlab-elasticsearch-git (~> 1.0.1) + gitlab-elasticsearch-git (~> 1.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-license (~> 1.0) gitlab-markup (~> 1.5.1)