diff --git a/Gemfile b/Gemfile index 2aa83c40..8862d94f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem "rails", "6.1.6.1" gem "audited" gem "cancancan" -gem "elasticsearch", "~> 7.9.0" # gem's major must match db's +gem "elasticsearch", "~> 7.17.11" # gem's major must match db's gem "elasticsearch-model" gem "elasticsearch-rails" gem "gds-sso" diff --git a/Gemfile.lock b/Gemfile.lock index e3b5e1bc..a86f2c4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,18 +106,19 @@ GEM dotenv-rails (3.1.0) dotenv (= 3.1.0) railties (>= 6.1) - elasticsearch (7.9.0) - elasticsearch-api (= 7.9.0) - elasticsearch-transport (= 7.9.0) - elasticsearch-api (7.9.0) + elasticsearch (7.17.11) + elasticsearch-api (= 7.17.11) + elasticsearch-transport (= 7.17.11) + elasticsearch-api (7.17.11) multi_json elasticsearch-model (7.2.1) activesupport (> 3) elasticsearch (~> 7) hashie elasticsearch-rails (7.2.1) - elasticsearch-transport (7.9.0) - faraday (~> 1) + elasticsearch-transport (7.17.11) + base64 + faraday (>= 1, < 3) multi_json erubi (1.12.0) et-orbi (1.2.7) @@ -128,29 +129,10 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http ffi (1.16.3) fugit (1.10.0) et-orbi (~> 1, >= 1.2.7) @@ -264,7 +246,8 @@ GEM minitest (5.22.2) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.4.0) + net-http (0.4.1) + uri net-imap (0.4.10) date net-protocol @@ -699,6 +682,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (2.5.0) + uri (0.13.0) version_gem (1.1.3) warden (1.2.9) rack (>= 2.0.9) @@ -735,7 +719,7 @@ DEPENDENCIES capybara database_cleaner dotenv-rails - elasticsearch (~> 7.9.0) + elasticsearch (~> 7.17.11) elasticsearch-model elasticsearch-rails factory_bot_rails