Merge branch 'dev' into bb-track-types-of-gardens

2026-04-17 13:30:41 -04:00 · 2019-01-27 11:43:49 +13:00
parent e17e5c9297 2057aef0ea
commit bc576ccc44
2 changed files with 2 additions and 3 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
      public_suffix (>= 2.0.2, < 4.0)
    arel (9.0.0)
    ast (2.4.0)
@@ -80,7 +80,7 @@ GEM
      uniform_notifier (~> 1.11)
    byebug (10.0.2)
    cancancan (2.3.0)
-    capybara (3.12.0)
+    capybara (3.13.0)
      addressable
      mini_mime (>= 0.1.3)
      nokogiri (~> 1.8)
--- a/app.json
+++ b/app.json
@@ -38,7 +38,6 @@
  },
  "addons": [
    "heroku-postgresql",
-    "bonsai-elasticsearch",
    "memcachier",
    "newrelic",
    "sendgrid"