From 8e9ffac64e13af9ee3b4dcc1d437b4e89759f7f4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 09:58:35 +1030 Subject: [PATCH 01/16] Pin to hashie 3.4.* for https://github.com/intridea/hashie/issues/408 --- Gemfile | 1 + Gemfile.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 1639fd358..52d3ef5de 100644 --- a/Gemfile +++ b/Gemfile @@ -80,6 +80,7 @@ gem 'd3-rails' # See https://github.com/elastic/elasticsearch-ruby#compatibility gem "elasticsearch-api", "~> 2.0.0" gem "elasticsearch-model" +gem "hashie", "~> 3.4.4" # Required by elasticsearch-model, but needs to be pinned due to http://stackoverflow.com/questions/42170666/bundlergemrequireerror-there-was-an-error-while-trying-to-load-the-gem-omnia gem "elasticsearch-rails" gem 'rake', '>= 10.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 37bcf7f31..47e370e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,6 +550,7 @@ DEPENDENCIES haml-i18n-extractor haml-rails haml_lint + hashie (~> 3.4.4) heroku-api i18n-tasks jasmine From 248b89a5644edc2bb1d24796ad74603ec77d35ee Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:14:39 +1030 Subject: [PATCH 02/16] Update elasticsearch --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47e370e23..9090beb82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,17 +148,17 @@ GEM json thread thread_safe - elasticsearch (2.0.0) - elasticsearch-api (= 2.0.0) - elasticsearch-transport (= 2.0.0) - elasticsearch-api (2.0.0) + elasticsearch (2.0.1) + elasticsearch-api (= 2.0.1) + elasticsearch-transport (= 2.0.1) + elasticsearch-api (2.0.1) multi_json elasticsearch-model (0.1.9) activesupport (> 3) elasticsearch (> 0.4) hashie elasticsearch-rails (0.1.9) - elasticsearch-transport (2.0.0) + elasticsearch-transport (2.0.1) faraday multi_json erubis (2.7.0) From 9301688763222c47df4373577ae630951a0928f5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:15:14 +1030 Subject: [PATCH 03/16] Update guard --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9090beb82..ff81324f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM gravatar-ultimate (2.0.0) activesupport (>= 2.3.14) rack - guard (2.14.0) + guard (2.14.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (~> 1.0) @@ -391,7 +391,7 @@ GEM raindrops (0.17.0) rake (12.0.0) rb-fsevent (0.9.8) - rb-inotify (0.9.7) + rb-inotify (0.9.8) ffi (>= 0.5.0) redis (3.3.2) responders (2.3.0) From 47150a8ad83fcaff1a74784a5dfb2c6107bf664f Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:15:43 +1030 Subject: [PATCH 04/16] Update selenium-webdriver --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff81324f1..5e86c8aa0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - childprocess (0.5.9) + childprocess (0.6.1) ffi (~> 1.0, >= 1.0.11) climate_control (0.1.0) cliver (0.3.2) @@ -432,7 +432,7 @@ GEM ruby_dep (1.5.0) ruby_parser (3.8.4) sexp_processor (~> 4.1) - rubyzip (1.2.0) + rubyzip (1.2.1) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -440,7 +440,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (3.0.5) + selenium-webdriver (3.0.8) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) @@ -496,7 +496,7 @@ GEM nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) - websocket (1.2.3) + websocket (1.2.4) websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) From d0999c2f9a164ae90ea2be68f5647c62ceb8cbdf Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:26:31 +1030 Subject: [PATCH 05/16] Update activemerchant --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5e86c8aa0..71a62525c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM activejob (4.2.7.1) activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemerchant (1.61.0) + activemerchant (1.63.0) activesupport (>= 3.2.14, < 5.1) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) @@ -234,7 +234,7 @@ GEM ruby_parser (~> 3.5) httparty (0.14.0) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.8.0) i18n-tasks (0.9.9) activesupport (>= 4.0.2) ast (>= 2.1.0) From 55f00ed0f8bf6801a609b80e536b3f21106d25f4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:27:24 +1030 Subject: [PATCH 06/16] Update newrelic --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 71a62525c..8f61b5abf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -295,7 +295,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (3.17.1.326) + newrelic_rpm (3.18.1.330) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) notiffany (0.1.1) From 8112133cf275cf541bca0f60a15bea09d32b9734 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:28:08 +1030 Subject: [PATCH 07/16] Update unicorn --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8f61b5abf..b1c7a2a9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.10.0) + kgio (2.11.0) kramdown (1.13.2) launchy (2.4.3) addressable (~> 2.3) @@ -487,7 +487,7 @@ GEM execjs (>= 0.3.0) json (>= 1.8.0) unicode-display_width (1.1.3) - unicorn (5.1.0) + unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) warden (1.2.6) From 540ac7b03444f929c6b4f0cde0797972beea6ff7 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:28:51 +1030 Subject: [PATCH 08/16] Update warden --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b1c7a2a9f..507284f78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -490,7 +490,7 @@ GEM unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webrat (0.7.3) nokogiri (>= 1.2.0) From decd48a970c40d2337efd2c205a7de99b9b65291 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:29:30 +1030 Subject: [PATCH 09/16] Update geocoder, leaflet-rails --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 507284f78..35259b2f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM formatador (0.2.5) friendly_id (5.0.5) activerecord (>= 4.0.0) - geocoder (1.4.1) + geocoder (1.4.3) gibbon (1.2.1) httparty multi_json (>= 1.9.0) @@ -271,7 +271,7 @@ GEM addressable (~> 2.3) leaflet-markercluster-rails (0.7.0) railties (>= 3.1) - leaflet-rails (0.7.7) + leaflet-rails (1.0.2) letter_opener (1.4.1) launchy (~> 2.2) listen (3.1.5) From 48d3a64e7bdbc186fb29a567ab2e372d0bf92c13 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:30:16 +1030 Subject: [PATCH 10/16] Update cancancan --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35259b2f9..7b04e0815 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM bootstrap_form (2.5.3) builder (3.2.3) byebug (9.0.6) - cancancan (1.15.0) + cancancan (1.16.0) capybara (2.10.1) addressable mime-types (>= 1.16) From 5c1f5f4312d124b1e00c70791a781a9a9e13580a Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:32:02 +1030 Subject: [PATCH 11/16] Update poltergeist --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b04e0815..fadf589e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM builder (3.2.3) byebug (9.0.6) cancancan (1.16.0) - capybara (2.10.1) + capybara (2.12.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -338,7 +338,7 @@ GEM phantomjs (2.1.1.0) plupload-rails (1.2.1) rails (>= 3.1) - poltergeist (1.11.0) + poltergeist (1.13.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -497,7 +497,7 @@ GEM rack (>= 1.0) rack-test (>= 0.5.3) websocket (1.2.4) - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) will_paginate (3.1.5) From 5ec105ad1947e6ba10f408502cb2705b506772ab Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:43:53 +1030 Subject: [PATCH 12/16] Upgrade sidekiq --- Gemfile.lock | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fadf589e8..ffba39e8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - redis (3.3.2) + redis (3.3.3) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec (3.5.0) @@ -446,20 +446,16 @@ GEM websocket (~> 1.0) sexp_processor (4.7.0) shellany (0.0.1) - sidekiq (4.1.4) + sidekiq (4.2.9) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) slop (3.6.0) sparkpost_rails (1.4.0) rails (>= 4.0, < 5.1) @@ -478,7 +474,7 @@ GEM thor (0.19.4) thread (0.2.2) thread_safe (0.3.5) - tilt (2.0.5) + tilt (2.0.6) tins (1.13.0) trollop (1.16.2) tzinfo (1.2.2) From 9ccecf0e04292d1b26aef87d7265a030bde22517 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:46:02 +1030 Subject: [PATCH 13/16] Update i18n-tasks bootstrap_form font-awesome-sass --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ffba39e8f..c780e9732 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap_form (2.5.3) + bootstrap_form (2.6.0) builder (3.2.3) byebug (9.0.6) cancancan (1.16.0) @@ -175,7 +175,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (4.6.2) + font-awesome-sass (4.7.0) sass (>= 3.2) formatador (0.2.5) friendly_id (5.0.5) @@ -235,7 +235,7 @@ GEM httparty (0.14.0) multi_xml (>= 0.5.2) i18n (0.8.0) - i18n-tasks (0.9.9) + i18n-tasks (0.9.12) activesupport (>= 4.0.2) ast (>= 2.1.0) easy_translate (>= 0.5.0) @@ -332,7 +332,7 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parser (2.3.3.1) + parser (2.4.0.0) ast (~> 2.2) pg (0.19.0) phantomjs (2.1.1.0) @@ -475,7 +475,7 @@ GEM thread (0.2.2) thread_safe (0.3.5) tilt (2.0.6) - tins (1.13.0) + tins (1.13.2) trollop (1.16.2) tzinfo (1.2.2) thread_safe (~> 0.1) From da760a8a4cfed8d5e64652ebd6732ab16c34f543 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:46:45 +1030 Subject: [PATCH 14/16] Revert "Update geocoder, leaflet-rails" This reverts commit ecd2bb1c01e71cb716d4a9614441e75b4ccf80f5. --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c780e9732..8cf665e92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM formatador (0.2.5) friendly_id (5.0.5) activerecord (>= 4.0.0) - geocoder (1.4.3) + geocoder (1.4.1) gibbon (1.2.1) httparty multi_json (>= 1.9.0) @@ -271,7 +271,7 @@ GEM addressable (~> 2.3) leaflet-markercluster-rails (0.7.0) railties (>= 3.1) - leaflet-rails (1.0.2) + leaflet-rails (0.7.7) letter_opener (1.4.1) launchy (~> 2.2) listen (3.1.5) From 9218a03e2b63a17a850fdf352645e701a68db5c5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 10:47:52 +1030 Subject: [PATCH 15/16] Upgrade only geocoder --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8cf665e92..aa0e6a0e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM formatador (0.2.5) friendly_id (5.0.5) activerecord (>= 4.0.0) - geocoder (1.4.1) + geocoder (1.4.3) gibbon (1.2.1) httparty multi_json (>= 1.9.0) From d11e6f484a5a572676f094b04e98b54e65e21c98 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 11:09:17 +1030 Subject: [PATCH 16/16] Pin leaflet-rails for the moment, until we fix tests --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 52d3ef5de..180b9ad98 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ gem 'csv_shaper' # CSV export gem 'figaro' # for handling config via ENV variables gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions gem 'leaflet-markercluster-rails' -gem 'leaflet-rails' +gem 'leaflet-rails', '~> 0.7.7' # Newer versions break tests - see https://travis-ci.org/CloCkWeRX/growstuff/builds/200984350 gem 'pg' gem 'ruby-units' # for unit conversion gem 'unicorn' # http server diff --git a/Gemfile.lock b/Gemfile.lock index aa0e6a0e4..a08bde827 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -555,7 +555,7 @@ DEPENDENCIES js-routes kaminari leaflet-markercluster-rails - leaflet-rails + leaflet-rails (~> 0.7.7) letter_opener memcachier newrelic_rpm