From 4bdcb782d97c3d95aa7403b6d04f8c3c94925ed7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 02:37:04 +0000 Subject: [PATCH 01/73] [Security] Bump nokogiri from 1.8.4 to 1.8.5 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 106f5d901..f5c117992 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -311,7 +311,7 @@ GEM multipart-post (2.0.0) nenv (0.3.0) newrelic_rpm (5.2.0.345) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) From d05569fc27f7812879669b033faff7e18775ca50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 02:53:14 +0000 Subject: [PATCH 02/73] Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347 Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.2.0.345 to 5.4.0.347. - [Release notes](https://github.com/newrelic/rpm/releases) - [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md) - [Commits](https://github.com/newrelic/rpm/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f5c117992..2a02e45bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (5.2.0.345) + newrelic_rpm (5.4.0.347) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) From 71badfbc3c53cb311a1611366c231b470c5dc7ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 7 Oct 2018 08:42:58 +0000 Subject: [PATCH 03/73] Bump chartkick from 2.3.5 to 3.0.1 Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.5 to 3.0.1. - [Release notes](https://github.com/ankane/chartkick/releases) - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/chartkick/compare/v2.3.5...v3.0.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a02e45bb..10d81d0e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM capybara-screenshot (1.0.21) capybara (>= 1.0, < 4) launchy - chartkick (2.3.5) + chartkick (3.0.1) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) climate_control (0.2.0) From ac535d32e89677ce8f8c1baf84b65c550614a9ff Mon Sep 17 00:00:00 2001 From: Ahmed Shahin Date: Wed, 10 Oct 2018 08:42:05 +0200 Subject: [PATCH 04/73] Provide message to raise_error --- spec/controllers/photos_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 4be3aec7f..e54933c3e 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -113,7 +113,7 @@ describe PhotosController do comment = FactoryBot.create(:comment) expect do post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id - end.to raise_error + end.to raise_error('Photos not supported') end end From 5dde5610ebf36a63b09e5ee128bd2d9990c517e4 Mon Sep 17 00:00:00 2001 From: Ahmed Shahin Date: Wed, 10 Oct 2018 08:46:28 +0200 Subject: [PATCH 05/73] Add my name to contributors list --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fba00e2c3..4447030c4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -85,6 +85,7 @@ submit the change with your pull request. - Mark Taffman / [mftaff](https://github.com/mftaff) - Jennifer Kruse / [jenkr55](https://github.com/jenkr55) - Christopher Bazin / [RobotScissors](https://github.com/robotscissors) +- Ahmed Shahin / [codeminator](https://www.github.com/codeminator) ## Bots From 42f05a0f3ea5305870cfd855f6fd3aaecbda6358 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 10 Oct 2018 08:22:23 +0000 Subject: [PATCH 06/73] Bump sidekiq from 5.2.1 to 5.2.2 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10d81d0e3..d73d3a212 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -474,7 +474,7 @@ GEM rubyzip (~> 1.2) sexp_processor (4.11.0) shellany (0.0.1) - sidekiq (5.2.1) + sidekiq (5.2.2) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) From 2f34846c6632dd93e1240d37d12a35d825b93c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 16 Oct 2018 07:35:55 +0000 Subject: [PATCH 07/73] Bump ruby-units from 2.3.0 to 2.3.1 Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/olbrich/ruby-units/releases) - [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt) - [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d73d3a212..ff0ef3a25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -450,7 +450,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - ruby-units (2.3.0) + ruby-units (2.3.1) ruby_dep (1.5.0) ruby_parser (3.11.0) sexp_processor (~> 4.9) From 6e0687c2c32c696c6b0c9763c854f7c585386190 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 01:22:11 +0000 Subject: [PATCH 08/73] Bump font-awesome-sass from 5.0.13 to 5.4.1 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.13 to 5.4.1. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff0ef3a25..bcba41b31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.0.13) + font-awesome-sass (5.4.1) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) @@ -455,7 +455,7 @@ GEM ruby_parser (3.11.0) sexp_processor (~> 4.9) rubyzip (1.2.2) - sass (3.5.6) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -466,9 +466,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.12.0) + sassc (2.0.0) ffi (~> 1.9.6) - sass (>= 3.3.0) + rake selenium-webdriver (3.14.0) childprocess (~> 0.5) rubyzip (~> 1.2) From 5021061523f79b1404409c5d7f8277ae36cfe586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 07:35:43 +0000 Subject: [PATCH 09/73] Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0 Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases) - [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bcba41b31..1d702a632 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,7 +421,7 @@ GEM rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) - rspec-activemodel-mocks (1.0.3) + rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) From c9084618d0d55cf79a916d29377bd364b676864f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 09:08:22 +0000 Subject: [PATCH 10/73] Bump devise from 4.4.3 to 4.5.0 Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d702a632..c034ffc75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,7 +53,7 @@ GEM ast (2.4.0) autoprefixer-rails (8.6.4) execjs - bcrypt (3.1.11) + bcrypt (3.1.12) better_errors (2.2.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -136,7 +136,7 @@ GEM dalli (2.7.8) database_cleaner (1.7.0) debug_inspector (0.0.3) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) From 0e4005897e5e3003fe0d0574a2c324d5255fe7f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 09:37:47 +0000 Subject: [PATCH 11/73] Bump bullet from 5.7.5 to 5.7.6 Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c034ffc75..7907b9ab1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM sass (>= 3.3.4) bootstrap_form (2.7.0) builder (3.2.3) - bullet (5.7.5) + bullet (5.7.6) activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) byebug (10.0.2) From d9e7c9a831d3bb98a7ea864b84c8c9160fd5310f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Sep 2018 07:54:46 +0000 Subject: [PATCH 12/73] Bump factory_bot_rails from 4.10.0 to 4.11.1 Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.10.0 to 4.11.1. - [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases) - [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS) - [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7907b9ab1..ccbb8a1f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,10 +163,10 @@ GEM erubis (2.7.0) excon (0.62.0) execjs (2.7.0) - factory_bot (4.10.0) + factory_bot (4.11.1) activesupport (>= 3.0.0) - factory_bot_rails (4.10.0) - factory_bot (~> 4.10.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) railties (>= 3.0.0) faker (1.9.1) i18n (>= 0.7) From 89b475940ff46442c8c28622817e383f1df4dcfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 02:53:14 +0000 Subject: [PATCH 13/73] Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347 Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.2.0.345 to 5.4.0.347. - [Release notes](https://github.com/newrelic/rpm/releases) - [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md) - [Commits](https://github.com/newrelic/rpm/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f5c117992..2a02e45bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (5.2.0.345) + newrelic_rpm (5.4.0.347) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) From 900d51828d92b8c16c88c62e0a1f6b8ba8dbf0f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 7 Oct 2018 08:42:58 +0000 Subject: [PATCH 14/73] Bump chartkick from 2.3.5 to 3.0.1 Bumps [chartkick](https://github.com/ankane/chartkick) from 2.3.5 to 3.0.1. - [Release notes](https://github.com/ankane/chartkick/releases) - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/chartkick/compare/v2.3.5...v3.0.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a02e45bb..10d81d0e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM capybara-screenshot (1.0.21) capybara (>= 1.0, < 4) launchy - chartkick (2.3.5) + chartkick (3.0.1) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) climate_control (0.2.0) From 4b6de081814050cf36df5fb64ae7e68953b14bdd Mon Sep 17 00:00:00 2001 From: Ahmed Shahin Date: Wed, 10 Oct 2018 08:42:05 +0200 Subject: [PATCH 15/73] Provide message to raise_error --- spec/controllers/photos_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 4be3aec7f..e54933c3e 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -113,7 +113,7 @@ describe PhotosController do comment = FactoryBot.create(:comment) expect do post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id - end.to raise_error + end.to raise_error('Photos not supported') end end From f73cc7f213da3dde941fa0627d21c2265d5e5859 Mon Sep 17 00:00:00 2001 From: Ahmed Shahin Date: Wed, 10 Oct 2018 08:46:28 +0200 Subject: [PATCH 16/73] Add my name to contributors list --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fba00e2c3..4447030c4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -85,6 +85,7 @@ submit the change with your pull request. - Mark Taffman / [mftaff](https://github.com/mftaff) - Jennifer Kruse / [jenkr55](https://github.com/jenkr55) - Christopher Bazin / [RobotScissors](https://github.com/robotscissors) +- Ahmed Shahin / [codeminator](https://www.github.com/codeminator) ## Bots From 22787fa9945e93500ae3e8e0ab54be68585370d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 10 Oct 2018 08:22:23 +0000 Subject: [PATCH 17/73] Bump sidekiq from 5.2.1 to 5.2.2 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10d81d0e3..d73d3a212 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -474,7 +474,7 @@ GEM rubyzip (~> 1.2) sexp_processor (4.11.0) shellany (0.0.1) - sidekiq (5.2.1) + sidekiq (5.2.2) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) From cfcbd10844b8f427d816087f4d62ce7af5771589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 16 Oct 2018 07:35:55 +0000 Subject: [PATCH 18/73] Bump ruby-units from 2.3.0 to 2.3.1 Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/olbrich/ruby-units/releases) - [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt) - [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d73d3a212..ff0ef3a25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -450,7 +450,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - ruby-units (2.3.0) + ruby-units (2.3.1) ruby_dep (1.5.0) ruby_parser (3.11.0) sexp_processor (~> 4.9) From fdf4defb4644667952153387e80bc1924ddc9b97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 01:22:11 +0000 Subject: [PATCH 19/73] Bump font-awesome-sass from 5.0.13 to 5.4.1 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.0.13 to 5.4.1. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff0ef3a25..bcba41b31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.0.13) + font-awesome-sass (5.4.1) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) @@ -455,7 +455,7 @@ GEM ruby_parser (3.11.0) sexp_processor (~> 4.9) rubyzip (1.2.2) - sass (3.5.6) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -466,9 +466,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.12.0) + sassc (2.0.0) ffi (~> 1.9.6) - sass (>= 3.3.0) + rake selenium-webdriver (3.14.0) childprocess (~> 0.5) rubyzip (~> 1.2) From 4a91bd977fc9de09a4e4c62a90b7e3a6fb202558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 07:35:43 +0000 Subject: [PATCH 20/73] Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0 Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases) - [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bcba41b31..1d702a632 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,7 +421,7 @@ GEM rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) - rspec-activemodel-mocks (1.0.3) + rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) From 0c36ea4fef72dd28d5f6fd154b819a0cd8a20a51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 09:08:22 +0000 Subject: [PATCH 21/73] Bump devise from 4.4.3 to 4.5.0 Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d702a632..c034ffc75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,7 +53,7 @@ GEM ast (2.4.0) autoprefixer-rails (8.6.4) execjs - bcrypt (3.1.11) + bcrypt (3.1.12) better_errors (2.2.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -136,7 +136,7 @@ GEM dalli (2.7.8) database_cleaner (1.7.0) debug_inspector (0.0.3) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) From ea30f5b7b3be0966f0a8954e264f560eea17bbb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 18 Oct 2018 09:37:47 +0000 Subject: [PATCH 22/73] Bump bullet from 5.7.5 to 5.7.6 Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c034ffc75..7907b9ab1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM sass (>= 3.3.4) bootstrap_form (2.7.0) builder (3.2.3) - bullet (5.7.5) + bullet (5.7.6) activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) byebug (10.0.2) From 0694d37916a799d90f460fc10b4fecdf81af06ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Sep 2018 07:54:46 +0000 Subject: [PATCH 23/73] Bump factory_bot_rails from 4.10.0 to 4.11.1 Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 4.10.0 to 4.11.1. - [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases) - [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS) - [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7907b9ab1..ccbb8a1f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,10 +163,10 @@ GEM erubis (2.7.0) excon (0.62.0) execjs (2.7.0) - factory_bot (4.10.0) + factory_bot (4.11.1) activesupport (>= 3.0.0) - factory_bot_rails (4.10.0) - factory_bot (~> 4.10.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) railties (>= 3.0.0) faker (1.9.1) i18n (>= 0.7) From 23525371d9390f5d302bf65e7ebe30131f002c47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 07:47:05 +0000 Subject: [PATCH 24/73] Bump rack-protection from 2.0.3 to 2.0.4 Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.3...v2.0.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ccbb8a1f0..18ad6f05d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,7 +368,7 @@ GEM quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.10) - rack-protection (2.0.3) + rack-protection (2.0.4) rack rack-test (0.6.3) rack (>= 1.0) From a818a2ad4534238a2ad9dc194253c5668b86b20f Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 11 Sep 2018 03:03:12 +0000 Subject: [PATCH 25/73] Auto corrected by following Ruby Style/UnneededCondition --- spec/features/rss/plantings_spec.rb | 2 +- spec/features/rss/posts_spec.rb | 2 +- spec/features/rss/seeds_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/rss/plantings_spec.rb b/spec/features/rss/plantings_spec.rb index 59833eff1..c3f68fea6 100644 --- a/spec/features/rss/plantings_spec.rb +++ b/spec/features/rss/plantings_spec.rb @@ -9,6 +9,6 @@ feature 'Plantings RSS feed' do scenario 'The index title is what we expect' do visit plantings_path(format: 'rss') expect(page).to have_content "Recent plantings from "\ - "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end diff --git a/spec/features/rss/posts_spec.rb b/spec/features/rss/posts_spec.rb index 445a50cca..668276fbb 100644 --- a/spec/features/rss/posts_spec.rb +++ b/spec/features/rss/posts_spec.rb @@ -9,6 +9,6 @@ feature 'Posts RSS feed' do scenario 'The index title is what we expect' do visit posts_path(format: 'rss') expect(page).to have_content "Recent posts from "\ - "#{@author ? @author : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@author || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end diff --git a/spec/features/rss/seeds_spec.rb b/spec/features/rss/seeds_spec.rb index 888cc42ec..abb66e7e3 100644 --- a/spec/features/rss/seeds_spec.rb +++ b/spec/features/rss/seeds_spec.rb @@ -9,6 +9,6 @@ feature 'Seeds RSS feed' do scenario 'The index title is what we expect' do visit seeds_path(format: 'rss') expect(page).to have_content "Recent seeds from "\ - "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end From f02c1d80bed990486e094d2ef4d5137dec0fb997 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:59:57 +0000 Subject: [PATCH 26/73] Bump selenium-webdriver from 3.14.0 to 3.14.1 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18ad6f05d..aea8b6a19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,9 +469,9 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - selenium-webdriver (3.14.0) + selenium-webdriver (3.14.1) childprocess (~> 0.5) - rubyzip (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.11.0) shellany (0.0.1) sidekiq (5.2.2) From c6b38105af4b473f4562de3e8dd719a4985c6e9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:58:58 +0000 Subject: [PATCH 27/73] Bump platform-api from 2.1.0 to 2.2.0 Bumps [platform-api](https://github.com/heroku/platform-api) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/heroku/platform-api/releases) - [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index aea8b6a19..c2a116f92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM rubocop (>= 0.49.0) sysexits (~> 1.1) hashie (3.5.7) - heroics (0.0.24) + heroics (0.0.25) erubis (~> 2.0) excon moneta @@ -305,7 +305,7 @@ GEM mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) - moneta (0.8.1) + moneta (1.0.0) multi_json (1.11.3) multi_xml (0.6.0) multipart-post (2.0.0) @@ -351,9 +351,9 @@ GEM parser (2.5.1.0) ast (~> 2.4.0) pg (0.21.0) - platform-api (2.1.0) - heroics (~> 0.0.23) - moneta (~> 0.8.1) + platform-api (2.2.0) + heroics (~> 0.0.25) + moneta (~> 1.0.0) plupload-rails (1.2.1) rails (>= 3.1) poltergeist (1.17.0) From 10f7c864abeb63914a8a1bd938a789ad9e8f5a50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:59:55 +0000 Subject: [PATCH 28/73] Bump cancancan from 2.2.0 to 2.3.0 Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/CanCanCommunity/cancancan/releases) - [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md) - [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c2a116f92..85148fa25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) byebug (10.0.2) - cancancan (2.2.0) + cancancan (2.3.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) From 014b887a1f8dc24cb928d9f141235b86ff8e3adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Sep 2018 05:02:50 +0000 Subject: [PATCH 29/73] Bump jsonapi-resources from 0.9.0 to 0.9.3 Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.0 to 0.9.3. - [Release notes](https://github.com/cerebris/jsonapi-resources/releases) - [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85148fa25..fdefdfbbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -261,7 +261,7 @@ GEM railties (>= 3.2) sprockets-rails json (2.1.0) - jsonapi-resources (0.9.0) + jsonapi-resources (0.9.3) activerecord (>= 4.1) concurrent-ruby railties (>= 4.1) From 09c529a6efe595ef427cf5ae0ece6d28470f03db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 19:21:31 +0000 Subject: [PATCH 30/73] Bump codeclimate-test-reporter from 1.0.8 to 1.0.9 Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases) - [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md) - [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fdefdfbbe..bc082dd74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0, >= 1.0.11) climate_control (0.2.0) cliver (0.3.2) - codeclimate-test-reporter (1.0.8) + codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) codemirror-rails (5.16.0) railties (>= 3.0, < 6.0) From 122daca7d6bfcf78c8fc5d1d57a202734cf661e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 22 Oct 2018 20:26:53 +0000 Subject: [PATCH 31/73] Bump capybara-screenshot from 1.0.21 to 1.0.22 Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.21 to 1.0.22. - [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases) - [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md) - [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc082dd74..4b2ad7d55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ GEM capybara-email (3.0.1) capybara (>= 2.4, < 4.0) mail - capybara-screenshot (1.0.21) + capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy chartkick (3.0.1) @@ -302,7 +302,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) moneta (1.0.0) @@ -364,7 +364,7 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.2) + public_suffix (3.0.3) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.10) @@ -527,7 +527,7 @@ GEM websocket-extensions (0.1.3) will_paginate (3.1.6) xmlrpc (0.3.0) - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS From 77f5bcffb039b64a78680018da8bacbf57080aa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 24 Oct 2018 07:22:58 +0000 Subject: [PATCH 32/73] Bump rspec-rails from 3.8.0 to 3.8.1 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4b2ad7d55..5029b777c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,13 +427,13 @@ GEM rspec-mocks (>= 2.99, < 4.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) From 825883b3231cf5fdb01f25acbca7f195806da662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Oct 2018 14:02:01 +0000 Subject: [PATCH 33/73] [Security] Bump loofah from 2.2.2 to 2.2.3 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.** - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5029b777c..9e6e30c38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) From 37a3e9e9e160296e42993469b63486bc28a1f41d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Oct 2018 20:58:09 +0000 Subject: [PATCH 34/73] Bump bullet from 5.7.6 to 5.8.1 Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9e6e30c38..aa136214f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,9 +72,9 @@ GEM sass (>= 3.3.4) bootstrap_form (2.7.0) builder (3.2.3) - bullet (5.7.6) + bullet (5.8.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) + uniform_notifier (~> 1.11) byebug (10.0.2) cancancan (2.3.0) capybara (2.18.0) @@ -515,7 +515,7 @@ GEM unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.11.0) + uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) webrat (0.7.3) From d0ce89a9a5bd94d4500dc05f6d4293123d458615 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 31 Oct 2018 09:20:19 +0000 Subject: [PATCH 35/73] Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1 Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1. Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index aa136214f..a1e185a5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -383,9 +383,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.10) sprockets-rails - rails-assets-leaflet (1.3.1) - rails-assets-leaflet.markercluster (1.3.0) - rails-assets-leaflet (>= 1.0.3) + rails-assets-leaflet (1.3.4) + rails-assets-leaflet.markercluster (1.4.1) + rails-assets-leaflet (>= 1.3.1) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) From ea286e83008c2683338da1a508ba652110aadf8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 31 Oct 2018 09:47:09 +0000 Subject: [PATCH 36/73] Bump dalli from 2.7.8 to 2.7.9 Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.8 to 2.7.9. - [Release notes](https://github.com/petergoldstein/dalli/releases) - [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md) - [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1e185a5a..7b88061fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM crass (1.0.4) csv_shaper (1.3.0) activesupport (>= 3.0.0) - dalli (2.7.8) + dalli (2.7.9) database_cleaner (1.7.0) debug_inspector (0.0.3) devise (4.5.0) From d5dff62b48d3027cdb2082eea66bc1c2e85255b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 1 Nov 2018 07:24:57 +0000 Subject: [PATCH 37/73] Bump selenium-webdriver from 3.14.1 to 3.141.0 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.1 to 3.141.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b88061fc..94bb2d1e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,7 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - selenium-webdriver (3.14.1) + selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.11.0) From 709d1880043e5fdc3e3dac243a7fc0aff158b994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 5 Nov 2018 07:56:14 +0000 Subject: [PATCH 38/73] Bump font-awesome-sass from 5.4.1 to 5.5.0 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.4.1 to 5.5.0. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 94bb2d1e7..7452053c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.4.1) + font-awesome-sass (5.5.0) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) From 832ec2e15e98a3bb4b9fe0eb939388efa0297528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 6 Nov 2018 07:14:48 +0000 Subject: [PATCH 39/73] [Security] Bump rack from 1.6.10 to 1.6.11 Bumps [rack](https://github.com/rack/rack) from 1.6.10 to 1.6.11. **This update includes security fixes.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7452053c3..a95da98be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -367,7 +367,7 @@ GEM public_suffix (3.0.3) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.10) + rack (1.6.11) rack-protection (2.0.4) rack rack-test (0.6.3) From 2d10abcc5909ade21bb424b30cd0b01a33c5fbb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 8 Nov 2018 07:23:52 +0000 Subject: [PATCH 40/73] Bump font-awesome-sass from 5.5.0 to 5.5.0.1 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.5.0 to 5.5.0.1. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a95da98be..73c33fa63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.5.0) + font-awesome-sass (5.5.0.1) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) From ec22039fc16b4bd460844a2b16d3b99f1c944562 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 07:47:05 +0000 Subject: [PATCH 41/73] Bump rack-protection from 2.0.3 to 2.0.4 Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v2.0.3...v2.0.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ccbb8a1f0..18ad6f05d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,7 +368,7 @@ GEM quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.10) - rack-protection (2.0.3) + rack-protection (2.0.4) rack rack-test (0.6.3) rack (>= 1.0) From ebe7cc3868ff226e3284572f2c842d3d50a5f52d Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 11 Sep 2018 03:03:12 +0000 Subject: [PATCH 42/73] Auto corrected by following Ruby Style/UnneededCondition --- spec/features/rss/plantings_spec.rb | 2 +- spec/features/rss/posts_spec.rb | 2 +- spec/features/rss/seeds_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/rss/plantings_spec.rb b/spec/features/rss/plantings_spec.rb index 59833eff1..c3f68fea6 100644 --- a/spec/features/rss/plantings_spec.rb +++ b/spec/features/rss/plantings_spec.rb @@ -9,6 +9,6 @@ feature 'Plantings RSS feed' do scenario 'The index title is what we expect' do visit plantings_path(format: 'rss') expect(page).to have_content "Recent plantings from "\ - "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end diff --git a/spec/features/rss/posts_spec.rb b/spec/features/rss/posts_spec.rb index 445a50cca..668276fbb 100644 --- a/spec/features/rss/posts_spec.rb +++ b/spec/features/rss/posts_spec.rb @@ -9,6 +9,6 @@ feature 'Posts RSS feed' do scenario 'The index title is what we expect' do visit posts_path(format: 'rss') expect(page).to have_content "Recent posts from "\ - "#{@author ? @author : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@author || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end diff --git a/spec/features/rss/seeds_spec.rb b/spec/features/rss/seeds_spec.rb index 888cc42ec..abb66e7e3 100644 --- a/spec/features/rss/seeds_spec.rb +++ b/spec/features/rss/seeds_spec.rb @@ -9,6 +9,6 @@ feature 'Seeds RSS feed' do scenario 'The index title is what we expect' do visit seeds_path(format: 'rss') expect(page).to have_content "Recent seeds from "\ - "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" + "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})" end end From 6be0486e598e9dce1d2963e574b0c08780dba2d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:59:57 +0000 Subject: [PATCH 43/73] Bump selenium-webdriver from 3.14.0 to 3.14.1 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18ad6f05d..aea8b6a19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,9 +469,9 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - selenium-webdriver (3.14.0) + selenium-webdriver (3.14.1) childprocess (~> 0.5) - rubyzip (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.11.0) shellany (0.0.1) sidekiq (5.2.2) From c4849a2e3e42787f2be3b24891d9bf3cd147a244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:58:58 +0000 Subject: [PATCH 44/73] Bump platform-api from 2.1.0 to 2.2.0 Bumps [platform-api](https://github.com/heroku/platform-api) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/heroku/platform-api/releases) - [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index aea8b6a19..c2a116f92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM rubocop (>= 0.49.0) sysexits (~> 1.1) hashie (3.5.7) - heroics (0.0.24) + heroics (0.0.25) erubis (~> 2.0) excon moneta @@ -305,7 +305,7 @@ GEM mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) - moneta (0.8.1) + moneta (1.0.0) multi_json (1.11.3) multi_xml (0.6.0) multipart-post (2.0.0) @@ -351,9 +351,9 @@ GEM parser (2.5.1.0) ast (~> 2.4.0) pg (0.21.0) - platform-api (2.1.0) - heroics (~> 0.0.23) - moneta (~> 0.8.1) + platform-api (2.2.0) + heroics (~> 0.0.25) + moneta (~> 1.0.0) plupload-rails (1.2.1) rails (>= 3.1) poltergeist (1.17.0) From c5a58975e33938f41fc2bdd441a9a48fe85c19e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 17:59:55 +0000 Subject: [PATCH 45/73] Bump cancancan from 2.2.0 to 2.3.0 Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/CanCanCommunity/cancancan/releases) - [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md) - [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c2a116f92..85148fa25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) byebug (10.0.2) - cancancan (2.2.0) + cancancan (2.3.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) From 6aa77041ce1cbe854c6bff8e4ef08ad7e70d5460 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Sep 2018 05:02:50 +0000 Subject: [PATCH 46/73] Bump jsonapi-resources from 0.9.0 to 0.9.3 Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.0 to 0.9.3. - [Release notes](https://github.com/cerebris/jsonapi-resources/releases) - [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85148fa25..fdefdfbbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -261,7 +261,7 @@ GEM railties (>= 3.2) sprockets-rails json (2.1.0) - jsonapi-resources (0.9.0) + jsonapi-resources (0.9.3) activerecord (>= 4.1) concurrent-ruby railties (>= 4.1) From 235136523e74a0c0ab510c848844373428a57d17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 19 Oct 2018 19:21:31 +0000 Subject: [PATCH 47/73] Bump codeclimate-test-reporter from 1.0.8 to 1.0.9 Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases) - [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md) - [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fdefdfbbe..bc082dd74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0, >= 1.0.11) climate_control (0.2.0) cliver (0.3.2) - codeclimate-test-reporter (1.0.8) + codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) codemirror-rails (5.16.0) railties (>= 3.0, < 6.0) From b80b6d21878507da864688d41ccbc138b523c06a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 22 Oct 2018 20:26:53 +0000 Subject: [PATCH 48/73] Bump capybara-screenshot from 1.0.21 to 1.0.22 Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.21 to 1.0.22. - [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases) - [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md) - [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc082dd74..4b2ad7d55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ GEM capybara-email (3.0.1) capybara (>= 2.4, < 4.0) mail - capybara-screenshot (1.0.21) + capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy chartkick (3.0.1) @@ -302,7 +302,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) moneta (1.0.0) @@ -364,7 +364,7 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.2) + public_suffix (3.0.3) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.10) @@ -527,7 +527,7 @@ GEM websocket-extensions (0.1.3) will_paginate (3.1.6) xmlrpc (0.3.0) - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS From 18b5792a3179d6bb9d4b60068264141d23a159e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 24 Oct 2018 07:22:58 +0000 Subject: [PATCH 49/73] Bump rspec-rails from 3.8.0 to 3.8.1 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4b2ad7d55..5029b777c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,13 +427,13 @@ GEM rspec-mocks (>= 2.99, < 4.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) From 39d451240c8f7dab3cdb708cc30ca1cced90d87d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Oct 2018 14:02:01 +0000 Subject: [PATCH 50/73] [Security] Bump loofah from 2.2.2 to 2.2.3 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.** - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5029b777c..9e6e30c38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) From b45162caff824b14da4fc8dbf764919d357ed71a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 30 Oct 2018 20:58:09 +0000 Subject: [PATCH 51/73] Bump bullet from 5.7.6 to 5.8.1 Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9e6e30c38..aa136214f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,9 +72,9 @@ GEM sass (>= 3.3.4) bootstrap_form (2.7.0) builder (3.2.3) - bullet (5.7.6) + bullet (5.8.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) + uniform_notifier (~> 1.11) byebug (10.0.2) cancancan (2.3.0) capybara (2.18.0) @@ -515,7 +515,7 @@ GEM unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.11.0) + uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) webrat (0.7.3) From c38f9d80478d74abf5eddaa77c07a1e2d91da8e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 31 Oct 2018 09:20:19 +0000 Subject: [PATCH 52/73] Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1 Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1. Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index aa136214f..a1e185a5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -383,9 +383,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.10) sprockets-rails - rails-assets-leaflet (1.3.1) - rails-assets-leaflet.markercluster (1.3.0) - rails-assets-leaflet (>= 1.0.3) + rails-assets-leaflet (1.3.4) + rails-assets-leaflet.markercluster (1.4.1) + rails-assets-leaflet (>= 1.3.1) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) From 977ddf301f7494a24409415e140deaa5f56736f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 31 Oct 2018 09:47:09 +0000 Subject: [PATCH 53/73] Bump dalli from 2.7.8 to 2.7.9 Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.8 to 2.7.9. - [Release notes](https://github.com/petergoldstein/dalli/releases) - [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md) - [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1e185a5a..7b88061fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM crass (1.0.4) csv_shaper (1.3.0) activesupport (>= 3.0.0) - dalli (2.7.8) + dalli (2.7.9) database_cleaner (1.7.0) debug_inspector (0.0.3) devise (4.5.0) From a748fd9773da6d2a28ce845ef8feced72ca0bc87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 1 Nov 2018 07:24:57 +0000 Subject: [PATCH 54/73] Bump selenium-webdriver from 3.14.1 to 3.141.0 Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.1 to 3.141.0. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b88061fc..94bb2d1e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,7 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - selenium-webdriver (3.14.1) + selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.11.0) From 2c81429e1eb0a26c8a843287f744aa8e5606e1d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 5 Nov 2018 07:56:14 +0000 Subject: [PATCH 55/73] Bump font-awesome-sass from 5.4.1 to 5.5.0 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.4.1 to 5.5.0. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 94bb2d1e7..7452053c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.4.1) + font-awesome-sass (5.5.0) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) From a051f4e06d7c784aa6ff4c4daca1adcfd8e09b49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 6 Nov 2018 07:14:48 +0000 Subject: [PATCH 56/73] [Security] Bump rack from 1.6.10 to 1.6.11 Bumps [rack](https://github.com/rack/rack) from 1.6.10 to 1.6.11. **This update includes security fixes.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7452053c3..a95da98be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -367,7 +367,7 @@ GEM public_suffix (3.0.3) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.10) + rack (1.6.11) rack-protection (2.0.4) rack rack-test (0.6.3) From 5c45beb54f43e58627dc375824f4ff59cf031166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 8 Nov 2018 07:23:52 +0000 Subject: [PATCH 57/73] Bump font-awesome-sass from 5.5.0 to 5.5.0.1 Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.5.0 to 5.5.0.1. - [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases) - [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a95da98be..73c33fa63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM figaro (1.1.1) thor (~> 0.14) flickraw (0.9.9) - font-awesome-sass (5.5.0) + font-awesome-sass (5.5.0.1) sassc (>= 1.11) formatador (0.2.5) friendly_id (5.2.4) From 0d183cee25e828a7d6e5caa468883c85fa75fa82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 9 Nov 2018 07:42:52 +0000 Subject: [PATCH 58/73] Bump newrelic_rpm from 5.4.0.347 to 5.5.0.348 Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.4.0.347 to 5.5.0.348. - [Release notes](https://github.com/newrelic/rpm/releases) - [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md) - [Commits](https://github.com/newrelic/rpm/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 73c33fa63..72e19fdf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (5.4.0.347) + newrelic_rpm (5.5.0.348) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) From 825d8b6b3f647fcd5460d01b6f24302989b28ac2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 8 Nov 2018 09:30:19 +0000 Subject: [PATCH 59/73] Bump pry from 0.11.3 to 0.12.0 Bumps [pry](https://github.com/pry/pry) from 0.11.3 to 0.12.0. - [Release notes](https://github.com/pry/pry/releases) - [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md) - [Commits](https://github.com/pry/pry/compare/v0.11.3...v0.12.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 72e19fdf4..8ebcff220 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,7 @@ GEM mail (2.7.0) mini_mime (>= 0.1.1) memcachier (0.0.2) - method_source (0.9.0) + method_source (0.9.1) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -361,7 +361,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - pry (0.11.3) + pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) From 3506cf59de9e328bd32312d8a08a2942b958ca6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 12 Nov 2018 08:00:02 +0000 Subject: [PATCH 60/73] Bump bullet from 5.8.1 to 5.9.0 Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ebcff220..07df9d00e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM sass (>= 3.3.4) bootstrap_form (2.7.0) builder (3.2.3) - bullet (5.8.1) + bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (10.0.2) @@ -122,7 +122,7 @@ GEM rails (>= 4.0.0, < 5.1) rails-i18n (>= 4.0.0) sass-rails (>= 4.0.3) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) connection_pool (2.2.2) coveralls (0.8.19) json (>= 1.8, < 3) From 6c6724b558cb11cf226e972787a8fee5b4f661b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 15 Nov 2018 07:39:40 +0000 Subject: [PATCH 61/73] Bump guard from 2.14.2 to 2.15.0 Bumps [guard](https://github.com/guard/guard) from 2.14.2 to 2.15.0. - [Release notes](https://github.com/guard/guard/releases) - [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md) - [Commits](https://github.com/guard/guard/compare/v2.14.2...v2.15.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07df9d00e..d52230935 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,7 +190,7 @@ GEM gravatar-ultimate (2.0.0) activesupport (>= 2.3.14) rack - guard (2.14.2) + guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -297,7 +297,7 @@ GEM mail (2.7.0) mini_mime (>= 0.1.1) memcachier (0.0.2) - method_source (0.9.1) + method_source (0.9.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) From beab7fcfda2ae97d6ed9803624789b239c1eab72 Mon Sep 17 00:00:00 2001 From: Brandon Baker Date: Sun, 25 Nov 2018 17:48:02 -0700 Subject: [PATCH 62/73] hides crop varieties that have not been approved --- CONTRIBUTORS.md | 1 + app/views/crops/_hierarchy.html.haml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4447030c4..a9f784ac3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -86,6 +86,7 @@ submit the change with your pull request. - Jennifer Kruse / [jenkr55](https://github.com/jenkr55) - Christopher Bazin / [RobotScissors](https://github.com/robotscissors) - Ahmed Shahin / [codeminator](https://www.github.com/codeminator) +- Brandon Baker / [brandonbaker40](https://github.com/brandonbaker40) ## Bots diff --git a/app/views/crops/_hierarchy.html.haml b/app/views/crops/_hierarchy.html.haml index 19be51f6d..a4b760354 100644 --- a/app/views/crops/_hierarchy.html.haml +++ b/app/views/crops/_hierarchy.html.haml @@ -3,7 +3,7 @@ - unless defined? max - max = 0 # list all without "show all" toggle button - display_crops.each do |c| - %li.crop-hierarchy{ class: max != 0 && @count >= max ? ['hide', 'toggle'] : [] } + %li.crop-hierarchy{ class: (max != 0 && @count >= max) || !c.approved? ? ['hide', 'toggle'] : [] } = link_to c, c - @count += 1 - if c.varieties.present? From 11e8d1f7029f3fbac08384307ed4f0254bfcad7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 27 Nov 2018 07:20:00 +0000 Subject: [PATCH 63/73] Bump active_utils from 3.3.12 to 3.3.13 Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.12 to 3.3.13. - [Release notes](https://github.com/shopify/active_utils/releases) - [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/shopify/active_utils/compare/v3.3.12...v3.3.13) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d52230935..92345dc27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM addressable active_median (0.1.4) activerecord - active_utils (3.3.12) + active_utils (3.3.13) activesupport (>= 3.2, < 6.0) i18n activejob (4.2.10) From e2c3c26edcd07a5f6d20d2864d908b6973f0b892 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 30 Nov 2018 07:16:28 +0000 Subject: [PATCH 64/73] Bump active_utils from 3.3.13 to 3.3.15 Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.13 to 3.3.15. - [Release notes](https://github.com/shopify/active_utils/releases) - [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/shopify/active_utils/compare/v3.3.13...v3.3.15) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 92345dc27..6da0f567a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,8 +26,8 @@ GEM addressable active_median (0.1.4) activerecord - active_utils (3.3.13) - activesupport (>= 3.2, < 6.0) + active_utils (3.3.15) + activesupport (>= 4.2) i18n activejob (4.2.10) activesupport (= 4.2.10) From a91faecaa37d88e93f28a8c475c0ff965cb7e568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 27 Nov 2018 22:45:11 +0000 Subject: [PATCH 65/73] [Security] Bump rails from 4.2.10 to 4.2.11 Bumps [rails](https://github.com/rails/rails) from 4.2.10 to 4.2.11. **This update includes security fixes.** - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11) Signed-off-by: dependabot[bot] --- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da0f567a..2f97fe559 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,21 +2,21 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -29,17 +29,17 @@ GEM active_utils (3.3.15) activesupport (>= 4.2) i18n - activejob (4.2.10) - activesupport (= 4.2.10) + activejob (4.2.11) + activesupport (= 4.2.11) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) arel (~> 6.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -294,7 +294,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) memcachier (0.0.2) method_source (0.9.2) @@ -372,16 +372,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.11) sprockets-rails rails-assets-leaflet (1.3.4) rails-assets-leaflet.markercluster (1.4.1) @@ -402,9 +402,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) From 43f0cbe0ca8ef696fb3fc1fb53514400b434a4ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 15 Nov 2018 08:52:31 +0000 Subject: [PATCH 66/73] Bump pry from 0.12.0 to 0.12.2 Bumps [pry](https://github.com/pry/pry) from 0.12.0 to 0.12.2. - [Release notes](https://github.com/pry/pry/releases) - [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md) - [Commits](https://github.com/pry/pry/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2f97fe559..a6c5bf4fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -361,7 +361,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - pry (0.12.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) From 012cd75f5fb318141c282638e50a15a61a1bc07a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Dec 2018 07:32:54 +0000 Subject: [PATCH 67/73] Bump letter_opener from 1.6.0 to 1.7.0 Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ryanb/letter_opener/releases) - [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md) - [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6c5bf4fe..7a67c6926 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM addressable (~> 2.3) leaflet-rails (1.3.1) rails (>= 4.2.0) - letter_opener (1.6.0) + letter_opener (1.7.0) launchy (~> 2.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) From e6007dc09487e494bbbdbc879831805f1ec58944 Mon Sep 17 00:00:00 2001 From: Brandon Baker Date: Wed, 28 Nov 2018 10:36:29 -0700 Subject: [PATCH 68/73] adds inflections for irregular plural crop names --- config/initializers/inflections.rb | 197 +++++++++++++++++++++++- spec/features/crops/inflections_spec.rb | 32 ++++ 2 files changed, 224 insertions(+), 5 deletions(-) diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 599d85bf4..08def8d41 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -16,15 +16,202 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'square foot', 'square feet' - inflect.plural 'broccoli', 'broccoli' - inflect.plural 'kale', 'kale' - inflect.plural 'squash', 'squash' - inflect.plural 'bok choy', 'bok choy' + + # crops inflect.plural 'achiote', 'achiote' + inflect.plural 'agave', 'agave' inflect.plural 'alfalfa', 'alfalfa' inflect.plural 'allspice', 'allspice' - inflect.plural 'spinach', 'spinach' + inflect.plural 'aloe vera', 'arugula' + inflect.plural 'amaranth', 'amaranth' + inflect.plural 'Amelanchier', 'Amelanchier' + inflect.plural 'anise', 'anise' + inflect.plural 'anise hyssop', 'anise hyssop' + inflect.plural 'arrowroot', 'arrowroot' + inflect.plural 'arugula', 'arugula' + inflect.plural 'asparagus', 'asparagus' + inflect.plural 'avocado', 'avocadoes' + inflect.plural 'balm', 'balm' + inflect.plural 'bamboo', 'bamboo' + inflect.plural 'barley', 'barley' + inflect.plural 'basil', 'basil' + inflect.plural 'beebalm', 'beebalm' + inflect.plural 'black mustard', 'black mustard' + inflect.plural 'bok choy', 'bok choy' + inflect.plural 'borage', 'borage' + inflect.plural 'Brassica', 'Brassica' + inflect.plural 'Brassica oleracea', 'Brassica oleracea' + inflect.plural 'Brassica oleracea Acephela group', 'Brassica oleracea Acephela group' + inflect.plural 'Brassica rapa', 'Brassica rapa' + inflect.plural 'Brazilian starfish', 'Brazilian starfish' + inflect.plural 'breadfruit', 'breadfruit' + inflect.plural 'broccoflower', 'broccoflower' + inflect.plural 'broccoli', 'broccoli' + inflect.plural 'broccolini', 'broccolini' + inflect.plural 'Brussels sprouts', 'Brussels sprouts' + inflect.plural 'buckwheat', 'buckwheat' + inflect.plural 'burdock', 'burdock' + inflect.plural 'cabbage', 'cabbage' + inflect.plural 'calamint', 'calamint' + inflect.plural 'cantueso', 'cantueso' + inflect.plural 'capsicum', 'capsica' + inflect.plural 'capsicum annuum', 'capsicum annuum' + inflect.plural 'Capsicum baccatum', 'Capsicum baccatum' + inflect.plural 'Capsicum chinense', 'Capsicum chinense' + inflect.plural 'cardinal vine', 'cardinal vine' + inflect.plural 'catnip', 'catnip' + inflect.plural 'cauliflower', 'cauliflower' + inflect.plural 'cavalo nero', 'cavalo nero' + inflect.plural 'celeriac', 'celeriac' + inflect.plural 'celery', 'celery' + inflect.plural 'celtuce', 'celtuce' + inflect.plural 'chard', 'chard' + inflect.plural 'chaya', 'chaya' + inflect.plural 'chervil', 'chervil' + inflect.plural 'chia', 'chia' + inflect.plural 'chickweed', 'chickweed' + inflect.plural 'chicory', 'chicory' + inflect.plural 'chilli', 'chillies' + inflect.plural 'chilli pepper', 'chilli peppers' + inflect.plural 'choy sum', 'choy sum' + inflect.plural 'cicely', 'cicely' + inflect.plural 'citron', 'citrones' + inflect.plural 'coffee', 'coffee' + inflect.plural 'comfrey', 'comfrey' + inflect.plural 'coriander', 'coriander' + inflect.plural 'corn', 'corn' + inflect.plural 'corn salad', 'corn salad' + inflect.plural 'cress', 'cress' + inflect.plural 'Cucurbita maxima', 'Cucurbita maxima' + inflect.plural 'cumin', 'cumin' + inflect.plural 'curry leaf', 'curry leaves' + inflect.plural 'dill', 'dill' + inflect.plural 'epazote', 'epazote' + inflect.plural 'fennel', 'fennel' + inflect.plural 'fenugreek', 'fenugreek' + inflect.plural 'flax', 'flax' + inflect.plural 'galangal', 'galangal' inflect.plural 'garlic', 'garlic' + inflect.plural 'ginger', 'ginger' + inflect.plural 'goji', 'goji' + inflect.plural 'Good King Henry', 'Good King Henry' + inflect.plural 'grains of paradise', 'grains of paradise' + inflect.plural 'grapefruit', 'grapefruit' + inflect.plural 'greater galangal', 'greater galangal' + inflect.plural 'guava', 'guava' + inflect.plural 'hemp', 'hemp' + inflect.plural 'hibiscus', 'hibiscuses' + inflect.plural 'hyssop', 'hyssop' + inflect.plural 'jabuticaba', 'jabuticaba' + inflect.plural 'jasmine', 'jasmine' + inflect.plural 'kabocha', 'kabocha' + inflect.plural 'kai lan', 'kai lan' + inflect.plural 'kale', 'kale' + inflect.plural 'kamo kamo', 'kamo kamo' + inflect.plural 'karaka', 'karaka' + inflect.plural 'kava', 'kava' + inflect.plural 'kawakawa', 'kawakawa' + inflect.plural 'kiwifruit', 'kiwifruit' + inflect.plural 'kohlrabi', 'kohlrabies' + inflect.plural 'komatsuna', 'komatsuna' + inflect.plural "lady's bedstraw", "lady's bedstraw" + inflect.plural 'lavender', 'lavender' + inflect.plural 'lemon myrtle', 'lemon myrtle' + inflect.plural 'lemonade', 'lemonade' + inflect.plural 'lemongrass', 'lemongrass' + inflect.plural 'lesser calamint', 'lesser calamint' + inflect.plural 'lesser galangal', 'lesser galangal' + inflect.plural 'lettuce', 'lettuce' inflect.plural 'licorice', 'licorice' inflect.plural 'lillipilli', 'lillipillies' + inflect.plural 'lovage', 'lovage' + inflect.plural 'luffa', 'luffa' + inflect.plural 'macadamia', 'macadamia' + inflect.plural 'mango', 'mangoes' + inflect.plural 'maracuja', 'maracuja' + inflect.plural 'marjoram', 'marjoram' + inflect.plural 'mashua', 'mashua' + inflect.plural 'milkweed', 'milkweed' + inflect.plural 'mint', 'mint' + inflect.plural 'miro', 'miro' + inflect.plural 'mitsuba', 'mitsuba' + inflect.plural 'mizuna', 'mizuna' + inflect.plural 'moringa', 'moringa' + inflect.plural 'mustard', 'mustard' + inflect.plural 'oak', 'oak' + inflect.plural 'okra', 'okra' + inflect.plural 'olive herb', 'olive herb' + inflect.plural 'olluco', 'olluco' + inflect.plural 'oregano', 'oregano' + inflect.plural 'pandan', 'pandan' + inflect.plural 'parsley', 'parsley' + inflect.plural 'passion fruit', 'passion fruit' + inflect.plural 'pearl millet', 'pearl millet' + inflect.plural 'pennyroyal', 'pennyroyal' + inflect.plural 'peppermint', 'peppermint' + inflect.plural 'perilla', 'perilla' + inflect.plural 'persimmon', 'persimmon' + inflect.plural 'potato', 'potatoes' + inflect.plural 'potato Gladstone', 'potato Gladstone' + inflect.plural 'potato matariki', 'potato matariki' + inflect.plural 'potato Taranaki', 'potato Taranaki' + inflect.plural 'Prince of Wales', 'Prince of Wales' + inflect.plural 'purslane', 'purslane' + inflect.plural 'quinoa', 'quinoa' + inflect.plural 'rainbow chard', 'rainbow chard' + inflect.plural 'rapeseed', 'rapeseed' + inflect.plural 'rapini', 'rapini' + inflect.plural 'rhubarb', 'rhubarb' + inflect.plural 'rosemary', 'rosemary' + inflect.plural 'rutabaga', 'rutabaga' + inflect.plural 'rye', 'rye' + inflect.plural 'safflower', 'safflower' + inflect.plural 'saffron', 'saffron' + inflect.plural 'sage', 'sage' + inflect.plural 'salad burnet', 'salad burnet' + inflect.plural 'salsify', 'salsify' + inflect.plural 'salvia', 'salvia' + inflect.plural 'sassafras', 'sassafras' + inflect.plural 'sesame', 'sesame' + inflect.plural 'shiitake', 'shiitake' + inflect.plural 'smallage', 'smallage' + inflect.plural 'sorghum', 'sorghum' + inflect.plural 'soybean', 'soybean' + inflect.plural 'spearmint', 'spearmint' + inflect.plural 'spinach', 'spinach' + inflect.plural 'spinach Santana', 'spinach Santana' + inflect.plural 'spring greens', 'spring greens' + inflect.plural 'squash', 'squash' + inflect.plural 'star anise', 'star anise' + inflect.plural 'starfruit', 'starfruit' + inflect.plural 'stevia', 'stevia' + inflect.plural 'summer savory', 'summer savory' + inflect.plural 'Swiss chard', 'Swiss chard' + inflect.plural 'tamarind', 'tamarind' + inflect.plural 'tampala', 'tampala' + inflect.plural 'tansy', 'tansy' + inflect.plural 'taro', 'taro' + inflect.plural 'tarragon', 'tarragon' + inflect.plural 'tatsoi', 'tatsoi' + inflect.plural 'tawa', 'tawa' + inflect.plural 'tea', 'tea' + inflect.plural 'thyme', 'thyme' + inflect.plural 'tromboncino', 'tromboncini' + inflect.plural 'turmeric', 'turmeric' + inflect.plural 'valerian', 'valerian' + inflect.plural 'vanilla', 'vanilla' + inflect.plural 'violet cauliflower', 'violet cauliflower' + inflect.plural 'wasabi', 'wasabi' + inflect.plural 'water caltrop', 'water caltrop' + inflect.plural 'watercress', 'watercress' + inflect.plural 'wattle', 'wattle' + inflect.plural 'wheat', 'wheat' + inflect.plural 'wild baccatum', 'wild baccatum' + inflect.plural 'wild bergamot', 'wild bergamot' + inflect.plural 'winter savory', 'winter savory' + inflect.plural 'wormwood', 'wormwood' + inflect.plural 'yarrow', 'yarrow' + inflect.plural 'yerba buena', 'yerba buena' + inflect.plural "za'atar", "za'atar" + inflect.plural 'zucchini', 'zucchini' end diff --git a/spec/features/crops/inflections_spec.rb b/spec/features/crops/inflections_spec.rb index d08f2490b..89c9de9f1 100644 --- a/spec/features/crops/inflections_spec.rb +++ b/spec/features/crops/inflections_spec.rb @@ -17,5 +17,37 @@ feature "irregular crop inflections" do expect("garlic".pluralize).to eq "garlic" expect("licorice".pluralize).to eq "licorice" expect("lillipilli".pluralize).to eq "lillipillies" + expect("barley".pluralize).to eq "barley" + expect("Brassica oleracea Acephela group".pluralize).to eq "Brassica oleracea Acephela group" + expect("common flax".pluralize).to eq "common flax" + expect("cumin".pluralize).to eq "cumin" + expect("Good King Henry".pluralize).to eq "Good King Henry" + expect("oregano".pluralize).to eq "oregano" + expect("star anise".pluralize).to eq "star anise" + end + + scenario "crops which are particularly irregular" do + expect("curry leaf".pluralize).to eq "curry leaves" + expect("capsicum".pluralize).to eq "capsica" + end + + scenario "crops which require -es" do + expect("mango".pluralize).to eq "mangoes" + expect("potato".pluralize).to eq "potatoes" + expect("avocado".pluralize).to eq "avocadoes" + end + + scenario "crops where the first crop would normally be pluralized" do + expect("Potato Onion".pluralize).to eq "Potato Onions" + expect("lemon basil".pluralize).to eq "lemon basil" + expect("pear tomato".pluralize).to eq "pear tomatoes" + expect("chilli pepper".pluralize).to eq "chilli peppers" + end + + scenario "crops where the proper name succeeds the crop that would normally be pluralized" do + expect("potato Taranaki".pluralize).to eq "potato Taranaki" + expect("potato Gladstone".pluralize).to eq "potato Gladstone" + expect("potato matariki".pluralize).to eq "potato matariki" + expect("spinach Santana".pluralize).to eq "spinach Santana" end end From c0450477c6dbe07b681ef22ba910ccc4dcaebb92 Mon Sep 17 00:00:00 2001 From: Brandon Baker Date: Wed, 28 Nov 2018 17:10:51 -0700 Subject: [PATCH 69/73] =?UTF-8?q?adds=20plural=20form=20of=20words=20with?= =?UTF-8?q?=20m=C4=81ori=20origin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/inflections.rb | 7 ++++++- spec/features/crops/inflections_spec.rb | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 08def8d41..e22f9765a 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -22,7 +22,7 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'agave', 'agave' inflect.plural 'alfalfa', 'alfalfa' inflect.plural 'allspice', 'allspice' - inflect.plural 'aloe vera', 'arugula' + inflect.plural 'aloe vera', 'aloe vera' inflect.plural 'amaranth', 'amaranth' inflect.plural 'Amelanchier', 'Amelanchier' inflect.plural 'anise', 'anise' @@ -101,6 +101,7 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'guava', 'guava' inflect.plural 'hemp', 'hemp' inflect.plural 'hibiscus', 'hibiscuses' + inflect.plural 'hīnau', 'hīnau' inflect.plural 'hyssop', 'hyssop' inflect.plural 'jabuticaba', 'jabuticaba' inflect.plural 'jasmine', 'jasmine' @@ -114,6 +115,7 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'kiwifruit', 'kiwifruit' inflect.plural 'kohlrabi', 'kohlrabies' inflect.plural 'komatsuna', 'komatsuna' + inflect.plural 'kūmara', 'kūmara' inflect.plural "lady's bedstraw", "lady's bedstraw" inflect.plural 'lavender', 'lavender' inflect.plural 'lemon myrtle', 'lemon myrtle' @@ -156,8 +158,10 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'potato matariki', 'potato matariki' inflect.plural 'potato Taranaki', 'potato Taranaki' inflect.plural 'Prince of Wales', 'Prince of Wales' + inflect.plural 'pūhā', 'pūhā' inflect.plural 'purslane', 'purslane' inflect.plural 'quinoa', 'quinoa' + inflect.plural 'radicchio', 'radicchio' inflect.plural 'rainbow chard', 'rainbow chard' inflect.plural 'rapeseed', 'rapeseed' inflect.plural 'rapini', 'rapini' @@ -174,6 +178,7 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'sassafras', 'sassafras' inflect.plural 'sesame', 'sesame' inflect.plural 'shiitake', 'shiitake' + inflect.plural 'shiso', 'shiso' inflect.plural 'smallage', 'smallage' inflect.plural 'sorghum', 'sorghum' inflect.plural 'soybean', 'soybean' diff --git a/spec/features/crops/inflections_spec.rb b/spec/features/crops/inflections_spec.rb index 89c9de9f1..e39cf572c 100644 --- a/spec/features/crops/inflections_spec.rb +++ b/spec/features/crops/inflections_spec.rb @@ -50,4 +50,10 @@ feature "irregular crop inflections" do expect("potato matariki".pluralize).to eq "potato matariki" expect("spinach Santana".pluralize).to eq "spinach Santana" end + + scenario "crops of Māori origin" do + expect("kūmara".pluralize).to eq "kūmara" + expect("pūhā".pluralize).to eq "pūhā" + end + end From 2c0746073efe0d617c9b3cddcf51757f02eff134 Mon Sep 17 00:00:00 2001 From: Brandon Baker Date: Thu, 29 Nov 2018 10:04:21 -0700 Subject: [PATCH 70/73] removes extra empty line detected at block body end --- config/initializers/inflections.rb | 1 - spec/features/crops/inflections_spec.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index e22f9765a..bc334aa45 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -181,7 +181,6 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'shiso', 'shiso' inflect.plural 'smallage', 'smallage' inflect.plural 'sorghum', 'sorghum' - inflect.plural 'soybean', 'soybean' inflect.plural 'spearmint', 'spearmint' inflect.plural 'spinach', 'spinach' inflect.plural 'spinach Santana', 'spinach Santana' diff --git a/spec/features/crops/inflections_spec.rb b/spec/features/crops/inflections_spec.rb index e39cf572c..d781e918e 100644 --- a/spec/features/crops/inflections_spec.rb +++ b/spec/features/crops/inflections_spec.rb @@ -55,5 +55,4 @@ feature "irregular crop inflections" do expect("kūmara".pluralize).to eq "kūmara" expect("pūhā".pluralize).to eq "pūhā" end - end From 7b15ae319da48bf90ac11d9d79cf96fec9dead24 Mon Sep 17 00:00:00 2001 From: Brandon Baker Date: Mon, 3 Dec 2018 09:58:15 -0700 Subject: [PATCH 71/73] corrects more inflections --- config/initializers/inflections.rb | 8 -------- spec/features/crops/inflections_spec.rb | 3 --- 2 files changed, 11 deletions(-) diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index bc334aa45..f30e7af4f 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -30,12 +30,9 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'arrowroot', 'arrowroot' inflect.plural 'arugula', 'arugula' inflect.plural 'asparagus', 'asparagus' - inflect.plural 'avocado', 'avocadoes' inflect.plural 'balm', 'balm' inflect.plural 'bamboo', 'bamboo' inflect.plural 'barley', 'barley' - inflect.plural 'basil', 'basil' - inflect.plural 'beebalm', 'beebalm' inflect.plural 'black mustard', 'black mustard' inflect.plural 'bok choy', 'bok choy' inflect.plural 'borage', 'borage' @@ -51,16 +48,13 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'Brussels sprouts', 'Brussels sprouts' inflect.plural 'buckwheat', 'buckwheat' inflect.plural 'burdock', 'burdock' - inflect.plural 'cabbage', 'cabbage' inflect.plural 'calamint', 'calamint' inflect.plural 'cantueso', 'cantueso' inflect.plural 'capsicum', 'capsica' inflect.plural 'capsicum annuum', 'capsicum annuum' inflect.plural 'Capsicum baccatum', 'Capsicum baccatum' inflect.plural 'Capsicum chinense', 'Capsicum chinense' - inflect.plural 'cardinal vine', 'cardinal vine' inflect.plural 'catnip', 'catnip' - inflect.plural 'cauliflower', 'cauliflower' inflect.plural 'cavalo nero', 'cavalo nero' inflect.plural 'celeriac', 'celeriac' inflect.plural 'celery', 'celery' @@ -123,7 +117,6 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'lemongrass', 'lemongrass' inflect.plural 'lesser calamint', 'lesser calamint' inflect.plural 'lesser galangal', 'lesser galangal' - inflect.plural 'lettuce', 'lettuce' inflect.plural 'licorice', 'licorice' inflect.plural 'lillipilli', 'lillipillies' inflect.plural 'lovage', 'lovage' @@ -152,7 +145,6 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.plural 'pennyroyal', 'pennyroyal' inflect.plural 'peppermint', 'peppermint' inflect.plural 'perilla', 'perilla' - inflect.plural 'persimmon', 'persimmon' inflect.plural 'potato', 'potatoes' inflect.plural 'potato Gladstone', 'potato Gladstone' inflect.plural 'potato matariki', 'potato matariki' diff --git a/spec/features/crops/inflections_spec.rb b/spec/features/crops/inflections_spec.rb index d781e918e..615c4c9e9 100644 --- a/spec/features/crops/inflections_spec.rb +++ b/spec/features/crops/inflections_spec.rb @@ -28,18 +28,15 @@ feature "irregular crop inflections" do scenario "crops which are particularly irregular" do expect("curry leaf".pluralize).to eq "curry leaves" - expect("capsicum".pluralize).to eq "capsica" end scenario "crops which require -es" do expect("mango".pluralize).to eq "mangoes" expect("potato".pluralize).to eq "potatoes" - expect("avocado".pluralize).to eq "avocadoes" end scenario "crops where the first crop would normally be pluralized" do expect("Potato Onion".pluralize).to eq "Potato Onions" - expect("lemon basil".pluralize).to eq "lemon basil" expect("pear tomato".pluralize).to eq "pear tomatoes" expect("chilli pepper".pluralize).to eq "chilli peppers" end From c8e625c45d05067ee3245abe42a262fcf73c816e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 13 Dec 2018 07:50:43 +0000 Subject: [PATCH 72/73] Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349 Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.5.0.348 to 5.6.0.349. - [Release notes](https://github.com/newrelic/rpm/releases) - [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md) - [Commits](https://github.com/newrelic/rpm/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7a67c6926..3cfb31ca2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (5.5.0.348) + newrelic_rpm (5.6.0.349) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) From d6c9132049d1c19c6cf79ade19703886fe6ccb07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 31 Dec 2018 07:26:24 +0000 Subject: [PATCH 73/73] Bump friendly_id from 5.2.4 to 5.2.5 Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.2.4 to 5.2.5. - [Release notes](https://github.com/norman/friendly_id/releases) - [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md) - [Commits](https://github.com/norman/friendly_id/compare/5.2.4...5.2.5) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cfb31ca2..4bf828c6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM rails (>= 4.0.0, < 5.1) rails-i18n (>= 4.0.0) sass-rails (>= 4.0.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) connection_pool (2.2.2) coveralls (0.8.19) json (>= 1.8, < 3) @@ -179,7 +179,7 @@ GEM font-awesome-sass (5.5.0.1) sassc (>= 1.11) formatador (0.2.5) - friendly_id (5.2.4) + friendly_id (5.2.5) activerecord (>= 4.0.0) geocoder (1.4.9) gibbon (1.2.1)