From 52403d8dd62ac0406619526ba1a3329cd668b015 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sun, 16 Jun 2019 15:02:39 +1200
Subject: [PATCH 1/3] Pin elasticsearch back at 6, to fix errors on
 staging/prod

---
 Gemfile      |  1 +
 Gemfile.lock | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index ae27ffe12..5d1b6fe6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,6 +88,7 @@ gem "chartkick"
 
 # clever elastic search
 gem 'searchkick'
+gem 'elasticsearch', '< 7.0.0'
 
 gem "hashie", ">= 3.5.3"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index be0674706..578f0b411 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,9 +63,9 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bluecloth (2.2.0)
-    bonsai-elasticsearch-rails (7.0.1)
-      elasticsearch-model (< 8)
-      elasticsearch-rails (< 8)
+    bonsai-elasticsearch-rails (6.0.0)
+      elasticsearch-model (~> 6)
+      elasticsearch-rails (~> 6)
     bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
@@ -142,17 +142,17 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.1.5)
-    elasticsearch (7.1.0)
-      elasticsearch-api (= 7.1.0)
-      elasticsearch-transport (= 7.1.0)
-    elasticsearch-api (7.1.0)
+    elasticsearch (6.8.0)
+      elasticsearch-api (= 6.8.0)
+      elasticsearch-transport (= 6.8.0)
+    elasticsearch-api (6.8.0)
       multi_json
     elasticsearch-model (6.0.0)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
     elasticsearch-rails (6.0.0)
-    elasticsearch-transport (7.1.0)
+    elasticsearch-transport (6.8.0)
       faraday
       multi_json
     erubi (1.8.0)
@@ -543,6 +543,7 @@ DEPENDENCIES
   dalli
   database_cleaner
   devise
+  elasticsearch (< 7.0.0)
   factory_bot_rails
   faker
   figaro
@@ -609,4 +610,4 @@ RUBY VERSION
    ruby 2.6.0p0
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

From f24ae3aafb2b0853931d7f29d78e0c55039234b1 Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Sun, 16 Jun 2019 03:04:51 +0000
Subject: [PATCH 2/3] [CodeFactor] Apply fixes

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 5d1b6fe6f..eb3f8e8ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,8 +87,8 @@ gem 'omniauth-twitter'
 gem "chartkick"
 
 # clever elastic search
-gem 'searchkick'
 gem 'elasticsearch', '< 7.0.0'
+gem 'searchkick'
 
 gem "hashie", ">= 3.5.3"
 

From f7406de7dc2afc3ca915b1d7dfcdbcd96203e579 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2019 07:58:10 +0000
Subject: [PATCH 3/3] Bump scout_apm from 2.4.24 to 2.5.0

Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.4.24 to 2.5.0.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.4.24...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 578f0b411..ce29b4a99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -454,7 +454,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (2.4.24)
+    scout_apm (2.5.0)
     searchkick (4.0.2)
       activemodel (>= 5)
       elasticsearch (>= 6)