From 5b5eacb738e511ca185449a3037aa9f4e3320907 Mon Sep 17 00:00:00 2001
From: deppbot <deppbot@jollygoodcode.com>
Date: Thu, 26 Apr 2018 09:23:58 +0800
Subject: [PATCH 1/2] Bundle Update on 2018-04-26

---
 Gemfile.lock | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e19af5749..1ca28af8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,9 @@ GEM
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
-    bonsai-elasticsearch-rails (0.0.4)
+    bonsai-elasticsearch-rails (0.2.0)
+      elasticsearch-model (~> 0)
+      elasticsearch-rails (~> 0)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
@@ -152,11 +154,11 @@ GEM
       elasticsearch-transport (= 2.0.2)
     elasticsearch-api (2.0.2)
       multi_json
-    elasticsearch-model (5.0.0)
+    elasticsearch-model (0.1.9)
       activesupport (> 3)
-      elasticsearch (> 1)
+      elasticsearch (> 0.4)
       hashie
-    elasticsearch-rails (5.0.2)
+    elasticsearch-rails (0.1.9)
     elasticsearch-transport (2.0.2)
       faraday
       multi_json
@@ -179,7 +181,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 +369,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 +509,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)
@@ -619,6 +621,7 @@ DEPENDENCIES
   will_paginate
   xmlrpc
 
+
 RUBY VERSION
    ruby 2.4.1p111
 

From aa9841dc7db47deb1f0cea7ae7a903b46e3cf692 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 28 Apr 2018 18:33:09 +1200
Subject: [PATCH 2/2] Pinned elastic search to 5.0.0. or later

---
 Gemfile      |  4 ++--
 Gemfile.lock | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

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 1ca28af8d..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)
@@ -61,9 +61,7 @@ GEM
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
-    bonsai-elasticsearch-rails (0.2.0)
-      elasticsearch-model (~> 0)
-      elasticsearch-rails (~> 0)
+    bonsai-elasticsearch-rails (0.0.4)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
@@ -154,11 +152,11 @@ GEM
       elasticsearch-transport (= 2.0.2)
     elasticsearch-api (2.0.2)
       multi_json
-    elasticsearch-model (0.1.9)
+    elasticsearch-model (5.0.0)
       activesupport (> 3)
-      elasticsearch (> 0.4)
+      elasticsearch (> 1)
       hashie
-    elasticsearch-rails (0.1.9)
+    elasticsearch-rails (5.0.2)
     elasticsearch-transport (2.0.2)
       faraday
       multi_json
@@ -561,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
@@ -621,7 +619,6 @@ DEPENDENCIES
   will_paginate
   xmlrpc
 
-
 RUBY VERSION
    ruby 2.4.1p111