diff --git a/Gemfile b/Gemfile index bc3d45a34..c55d5e70f 100644 --- a/Gemfile +++ b/Gemfile @@ -87,8 +87,8 @@ gem "chartkick" # elasticsearch we use # See https://github.com/elastic/elasticsearch-ruby#compatibility gem "elasticsearch-api", "~> 2.0.0" -gem "elasticsearch-model" -gem "elasticsearch-rails" +gem "elasticsearch-model", ">= 5.0.0" +gem "elasticsearch-rails", ">= 5.0.0" gem "hashie", ">= 3.5.3" gem 'rake', '>= 10.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index e19af5749..015c12fb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) ast (2.4.0) - autoprefixer-rails (8.3.0) + autoprefixer-rails (8.3.0.1) execjs bcrypt (3.1.11) better_errors (2.2.0) @@ -179,7 +179,7 @@ GEM font-awesome-sass (5.0.9) sass (>= 3.2) formatador (0.2.5) - friendly_id (5.2.3) + friendly_id (5.2.4) activerecord (>= 4.0.0) geocoder (1.4.7) gibbon (1.2.1) @@ -367,7 +367,7 @@ GEM public_suffix (3.0.2) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.9) + rack (1.6.10) rack-protection (2.0.1) rack rack-test (0.6.3) @@ -507,7 +507,7 @@ GEM trollop (1.16.2) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.9) + uglifier (4.1.10) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.2) unicorn (5.4.0) @@ -559,8 +559,8 @@ DEPENDENCIES database_cleaner devise elasticsearch-api (~> 2.0.0) - elasticsearch-model - elasticsearch-rails + elasticsearch-model (>= 5.0.0) + elasticsearch-rails (>= 5.0.0) factory_bot_rails faker figaro